diff --git a/manifest.json b/manifest.json index 0b6f37c..c6353ad 100644 --- a/manifest.json +++ b/manifest.json @@ -81,7 +81,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://47.103.142.123:1010/", //目标接口域名 + "target" : "https://guide.sz-trip.com/", //目标接口域名 "changeOrigin" : true, //是否跨域 "secure" : true, // 设置支持https协议的代理 "pathRewrite" : { diff --git a/pages.json b/pages.json index 733c14f..d1b4d55 100644 --- a/pages.json +++ b/pages.json @@ -65,6 +65,12 @@ "navigationBarTitleText": "账号密码" } }, + { + "path": "user/changePassword", + "style": { + "navigationBarTitleText": "修改密码" + } + }, { "path": "video/index", "style": { diff --git a/pages/login/login.vue b/pages/login/login.vue index 52abefd..9c48da4 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -57,7 +57,8 @@ url: this.$store.state.user.toPath }) } else { - uni.navigateBack({}) + // uni.navigateBack({}) + this.goBack() } }) } diff --git a/pages/user/user.vue b/pages/user/user.vue index 7070be8..b4294a6 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -1,6 +1,6 @@ @@ -39,12 +39,7 @@ font-size: 28rpx; color: #000000; border-bottom: 1rpx solid #D8D8D8; - - image { - width: 11.33rpx; - height: 20rpx; - margin-left: 20rpx; - vertical-align: middle; - } } + + \ No newline at end of file diff --git a/subPackages/user/changePassword.vue b/subPackages/user/changePassword.vue new file mode 100644 index 0000000..af053f8 --- /dev/null +++ b/subPackages/user/changePassword.vue @@ -0,0 +1,141 @@ + + + + + \ No newline at end of file diff --git a/subPackages/user/infoFilling.vue b/subPackages/user/infoFilling.vue index 7eafa02..6218a24 100644 --- a/subPackages/user/infoFilling.vue +++ b/subPackages/user/infoFilling.vue @@ -22,7 +22,7 @@ - + x @@ -62,7 +62,7 @@ - @@ -119,9 +119,7 @@ {{item.name}} - - @@ -151,18 +149,19 @@ {key: 'scenic_ids',value: '擅长景区'}, {key: 'lingo_ids',value: '语言能力'}, {key: 'sparkle_text', value: '核心亮点'}, - {key:'video_list', value: '讲解视频'} + {key:'video_list', value: '讲解视频'}, + {key:'honor', value: '荣誉称号'} ], lingoIds: [], scenicIds: [], speakText: [], + honor: [], selectionItem: null, // 景点选中更改的值 selection: {arr: [], value: [], valueStr: ''}, //弹窗值 fileList: [], deleteIndex: [], - deleteMode: false, // 视频删除 } }, @@ -201,6 +200,9 @@ if (this.valueType == 'video_list') { this.initVideo() } + if (this.valueType == 'honor') { + this.initHonor() + } } else { this.goBack() @@ -263,6 +265,15 @@ this.fileList = [] } }, + initHonor () { + try { + let fileList = uni.getStorageSync('userVideofileList') + this.fileList = JSON.parse(fileList) + console.log(this.fileList) + } catch(e) { + this.fileList = [] + } + }, addText () { this.speakText.push({text:''}) @@ -325,7 +336,8 @@ try { let res = JSON.parse(uploadFileRes.data) if (res.code == 1) { - _this.fileList.push(res.data.fullurl) + // _this.fileList.push(res.data.fullurl) + _this.fileList.push(res.data.url) } } catch(e) {} @@ -371,7 +383,7 @@ try { let res = JSON.parse(uploadFileRes.data) if (res.code == 1) { - _this.fileList.push(res.data.fullurl) + _this.fileList.push(res.data.url) } } catch(e) {} diff --git a/subPackages/user/register.vue b/subPackages/user/register.vue index 8636ce1..3839ed8 100644 --- a/subPackages/user/register.vue +++ b/subPackages/user/register.vue @@ -75,6 +75,22 @@ 保存修改 + + + + + {{item.name}} + + + + + + + 确定 + + + @@ -97,7 +113,13 @@ }, groupIds: [], // 导游等级 - + + popData: { + selection: [], + value: null, + valueStr: '', + keyName: '', + }, } }, mounted() { @@ -203,38 +225,38 @@ }); }, selectSex () { - let _this = this - let itemList = ['男','女'] - let valueList = ['1','2'] - uni.showActionSheet({ - itemList: itemList, - success: function (res) { - let index = res.tapIndex; - _this.info.genderStr = itemList[index] - _this.info.gender = valueList[index] - - }, - fail: function (res) { - console.log(res.errMsg); - } - }); + this.popData = { + selection: [{id: 1, name: "男"}, {id: 2,name:"女"}], + value: this.info.gender, + valueStr: this.info.genderStr, + keyName:"gender" + } + this.$refs.popup.open() + }, selectRank () { - let _this = this - let itemList = this.groupIds.map(v=>v.name) - let valueList = this.groupIds.map(v=>v.id) - uni.showActionSheet({ - itemList: itemList, - success: function (res) { - let index = res.tapIndex; - _this.info.group_idStr = itemList[index] - _this.info.group_id = valueList[index] - - }, - fail: function (res) { - console.log(res.errMsg); - } - }); + this.popData = { + selection: this.groupIds, + value: this.info.group_id, + valueStr: this.info.group_idStr, + keyName:"group_id" + } + this.$refs.popup.open() + }, + + // 单个选中 + changeItemSelect (item) { + if (this.popData.value == item.id) { + this.popData.value = null + } else { + this.popData.value = item.id + this.popData.valueStr = item.name + } + }, + popSubmit () { + this.info[this.popData.keyName] = this.popData.value + this.info[this.popData.keyName+"Str"] = this.popData.valueStr + this.$refs.popup.close() }, // 跳转修改数据 @@ -531,31 +553,65 @@ } .popup-box { - border-radius: 20rpx 20rpx 0rpx 0rpx; - background: #fff; - overflow: hidden; - - .popup-item { - width: 697rpx; - height: 99rpx; - font-weight: 500; - font-size: 31rpx; - color: #12293C; - margin: auto; - } - .popup-item:nth-child(2) { - border: none; - border-bottom: 1rpx solid #D8D8D8; - border-top: 1rpx solid #D8D8D8; - } - - .popup-items { - width: 100%; - height: 99rpx; - font-weight: 500; - font-size: 31rpx; - color: #12293C; - border-top: 13rpx solid #F2F2F2; + border-radius: 0rpx; + background: #fff; + overflow: hidden; + .btn-top{ + padding: 26rpx 26rpx 0 26rpx; + color: #999999; + font-size: 31rpx; + box-sizing: border-box; + } + .popup-content{ + max-height: 500rpx; + width: 100%; + overflow-x: hidden; + overflow-y: auto; + } + + .popup-item { + width: 697rpx; + height: 99rpx; + font-weight: 500; + font-size: 31rpx; + color: #12293C; + margin: auto; + border-bottom: 1rpx solid #D8D8D8; + position: relative; + } + .popup-item.active{ + color: #96684F; + } + .popup-item:last-of-type { + border: none; + } + .active-img{ + position: absolute; + right: 10rpx; + + } + + .popup-btns { + width: 100%; + height: 153rpx; + background: #FFFFFF; + color: #12293C; + border-top: 13rpx solid #F2F2F2; + box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(82,82,82,0.25); + padding: 40rpx 26rpx; + box-sizing: border-box; + view{ + box-sizing: border-box; + width: 100%; + height: 73.33rpx; + line-height: 73.33rpx; + background: #DC2525; + border-radius: 11rpx; + font-weight: bold; + font-size: 32rpx; + color: #FFFFFF; + text-align: center; + } + } } - } diff --git a/subPackages/user/userInfo.vue b/subPackages/user/userInfo.vue index 2eca7a6..8f38c88 100644 --- a/subPackages/user/userInfo.vue +++ b/subPackages/user/userInfo.vue @@ -29,7 +29,7 @@ ·工作相关 - + 导游等级 {{info.group_idStr}} 请选择 @@ -39,34 +39,39 @@ {{info.certificate_number}} 请填写 - + + 荣誉称号 + {{info.honorStr}} + 请选择 + + 工作年限 {{info.duration}} 请填写 - + 语言能力 {{info.lingo_idsStr}} 请选择 - + 擅长景区 {{info.scenic_idsStr}} 请选择 - + 个性签名 {{info.bio}} 请填写 - + 核心亮点 {{info.sparkle_textStr}} 请填写 ·讲解视频 - + 讲解视频 {{info.video_list.length}} 请选择 @@ -75,6 +80,24 @@ 保存修改 + + + + + + {{item.name}} + + + + + + + 确定 + + + + @@ -94,9 +117,17 @@ bio:'', video_list: [], sparkle_text: [], sparkle_textStr: '', + honor: [], honorStr: '' }, groupIds: [], // 导游等级 + + popData: { + selection: [], + value: null, + valueStr: '', + keyName: '', + }, } }, @@ -147,6 +178,7 @@ sparkle_textStr:(resData.sparkle_text || []).map(v=>v.text).join(','), video_list: video_list, + honor: [], honorStr: '' } }) }, @@ -203,38 +235,38 @@ }); }, selectSex () { - let _this = this - let itemList = ['男','女'] - let valueList = ['1','2'] - uni.showActionSheet({ - itemList: itemList, - success: function (res) { - let index = res.tapIndex; - _this.info.genderStr = itemList[index] - _this.info.gender = valueList[index] - - }, - fail: function (res) { - console.log(res.errMsg); - } - }); + this.popData = { + selection: [{id: 1, name: "男"}, {id: 2,name:"女"}], + value: this.info.gender, + valueStr: this.info.genderStr, + keyName:"gender" + } + this.$refs.popup.open() + }, selectRank () { - let _this = this - let itemList = this.groupIds.map(v=>v.name) - let valueList = this.groupIds.map(v=>v.id) - uni.showActionSheet({ - itemList: itemList, - success: function (res) { - let index = res.tapIndex; - _this.info.group_idStr = itemList[index] - _this.info.group_id = valueList[index] - - }, - fail: function (res) { - console.log(res.errMsg); - } - }); + this.popData = { + selection: this.groupIds, + value: this.info.group_id, + valueStr: this.info.group_idStr, + keyName:"group_id" + } + this.$refs.popup.open() + }, + + // 单个选中 + changeItemSelect (item) { + if (this.popData.value == item.id) { + this.popData.value = null + } else { + this.popData.value = item.id + this.popData.valueStr = item.name + } + }, + popSubmit () { + this.info[this.popData.keyName] = this.popData.value + this.info[this.popData.keyName+"Str"] = this.popData.valueStr + this.$refs.popup.close() }, // 跳转修改数据 @@ -484,7 +516,7 @@ color: #999999; } - .userinfo-item { + .userinfo-item.edit { & view::after { content: ""; width: 20rpx; @@ -539,9 +571,21 @@ } .popup-box { - border-radius: 20rpx 20rpx 0rpx 0rpx; + border-radius: 0rpx; background: #fff; overflow: hidden; + .btn-top{ + padding: 26rpx 26rpx 0 26rpx; + color: #999999; + font-size: 31rpx; + box-sizing: border-box; + } + .popup-content{ + max-height: 500rpx; + width: 100%; + overflow-x: hidden; + overflow-y: auto; + } .popup-item { width: 697rpx; @@ -550,20 +594,42 @@ font-size: 31rpx; color: #12293C; margin: auto; + border-bottom: 1rpx solid #D8D8D8; + position: relative; + } + .popup-item.active{ + color: #96684F; } - .popup-item:nth-child(2) { + .popup-item:last-of-type { border: none; - border-bottom: 1rpx solid #D8D8D8; - border-top: 1rpx solid #D8D8D8; + } + .active-img{ + position: absolute; + right: 10rpx; + } - .popup-items { + .popup-btns { width: 100%; - height: 99rpx; - font-weight: 500; - font-size: 31rpx; + height: 153rpx; + background: #FFFFFF; color: #12293C; border-top: 13rpx solid #F2F2F2; + box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(82,82,82,0.25); + padding: 40rpx 26rpx; + box-sizing: border-box; + view{ + box-sizing: border-box; + width: 100%; + height: 73.33rpx; + line-height: 73.33rpx; + background: #DC2525; + border-radius: 11rpx; + font-weight: bold; + font-size: 32rpx; + color: #FFFFFF; + text-align: center; + } } }