From bf8fcdbf4c347e178d8a4f8f0946f9af4584e6b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Tue, 9 Apr 2024 17:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=96=E7=81=AB=E8=B0=83=E6=95=B4=E8=87=AA?= =?UTF-8?q?=E7=94=B1=E6=9C=8D=E5=8A=A1=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 4 +-- manifest.json | 2 +- pages.json | 2 +- pages/business/handle.vue | 49 +++++++++-------------------------- pages/business/info.vue | 13 +++++++--- pages/pay/pay.vue | 21 ++++++++++----- pages/user/index.vue | 22 ++++++++-------- static/icons/user_nav_11.png | Bin 0 -> 5640 bytes 8 files changed, 51 insertions(+), 62 deletions(-) create mode 100644 static/icons/user_nav_11.png diff --git a/apis/index.js b/apis/index.js index cee64b3..cc2a4dd 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - // apiUrl : 'https://douhuo.douhuofalv.com/api/', - apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境 + apiUrl : 'https://douhuo.douhuofalv.com/api/', + // apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境 timeout : 60000 } diff --git a/manifest.json b/manifest.json index 37090b5..c2d2c5f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火法律", "appid" : "__UNI__C305C03", "description" : "纵有疾风起，人生不言弃", - "versionName" : "1.5.4", + "versionName" : "1.5.5", "versionCode" : 1054, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages.json b/pages.json index f6a2c97..87912d2 100644 --- a/pages.json +++ b/pages.json @@ -1018,7 +1018,7 @@ "iconPath": "static/icons/tabs_icon_00.png", "selectedIconPath": "static/icons/tabs_show_00.png", "pagePath": "pages/index/index", - "text": "服务包" + "text": "首页" }, { "iconPath": "static/icons/tabs_icon_02.png", "selectedIconPath": "static/icons/tabs_show_02.png", diff --git a/pages/business/handle.vue b/pages/business/handle.vue index ddbeb90..ceb4ef9 100644 --- a/pages/business/handle.vue +++ b/pages/business/handle.vue @@ -28,7 +28,7 @@ - + @@ -55,6 +55,7 @@ export default { data() { return { + id : '', pickerArr : [], pickerIndex : 0, pickertype : '', @@ -67,16 +68,20 @@ needAmount : 0, needDiff : 0, selectP : [], - selectPIndex: 0 + selectPIndex: 0, + priceTitle : '标的额' }; }, onShow() { const parentData = JSON.parse(decodeURIComponent(this.$Route.query.record)) + console.log(parentData) + this.id = parentData.id this.needDiff = parentData.need_diff this.needAmount = parentData.need_amount this.pickerArr = parentData.child.data this.pickertype = parentData.type this.selectP = parentData.select_p || [] + this.priceTitle = parentData.price_title if(parentData.child.has){ this.amountTypeInfo() } @@ -85,11 +90,12 @@ // 标的额比例计算 settleInfo() { let { pickerArr, pickerIndex } = this - let id = pickerArr[pickerIndex].id + let id = pickerArr.length > 0 ? pickerArr[pickerIndex].id : this.id + settleAmount({ amount : this.pickertype == 'select' ? this.selectP[this.selectPIndex].key : this.amount, username: this.phone - }, id).then(res => { + }, id).then(res => { this.price = res.price }).catch(err => { this.price = 0 @@ -133,11 +139,12 @@ let { pickerArr, pickerIndex } = this let id = pickerArr[pickerIndex].id amountType(id).then(res => { - let { type, need_amount, select_p, need_diff } = res; + let { type, need_amount, select_p, need_diff, price_title } = res; this.needDiff = need_diff this.pickertype = type this.needAmount = need_amount this.selectP = select_p || [] + this.priceTitle = price_title // if(type == 'select'){ // this.settleInfo() // } @@ -154,42 +161,10 @@ // 提交表单 onSubmit(){ let { name, phone, pickerIndex, price, priceValue, amount, pickerArr, pickertype, selectP, selectPIndex, diffPrice } = this - if(pickertype != 'free') { - if(selectP.length <= 0 && amount === ''){ - uni.showToast({ - title: '请输入标的额', - icon : 'none' - }) - return - } - } else { - if(priceValue === ''){ - uni.showToast({ - title: '请输入服务费金额', - icon : 'none' - }) - return - } - } - if(name === ''){ - uni.showToast({ - title: '请输入客户姓名', - icon : 'none' - }) - return - } - if(phone === ''){ - uni.showToast({ - title: '请输入客户手机号码', - icon : 'none' - }) - return - } uni.showLoading({ title: "提交中...", mask : true }) - let params = { big_id : pickerArr.length > 0 ? pickerArr[pickerIndex].id : this.$Route.query.bigFiveId, name : name, diff --git a/pages/business/info.vue b/pages/business/info.vue index 6a9a5c4..6e31bf1 100644 --- a/pages/business/info.vue +++ b/pages/business/info.vue @@ -7,7 +7,7 @@ {{bigFiveInfo.title}} - + ★ {{bigFiveInfo.subtitle}} @@ -15,7 +15,7 @@ - + @@ -52,7 +52,14 @@ duration:2000 }) }) - }, + }, + // 查看图片 + onOpenImg(index){ + wx.previewImage({ + urls : this.bigFiveInfo.pictures, + current : this.bigFiveInfo.pictures[index] + }) + } } } diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index 367a34c..171fa6b 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -376,17 +376,19 @@ // 上传打款凭证 onOffline(){ uni.chooseImage({ - count: 1, + count: 4, success: path => { - console.log('这是成功的') let { tempFiles } = path; - uploads([{ - name: 'file' + tempFiles[0].size, - uri : tempFiles[0].path - }], {}).then(updRes => { + let paths = tempFiles.map(val => { + return { + name: 'file' + val.size, + uri : val.path + } + }) + uploads(paths, {}).then(updRes => { let { path } = updRes cashierOffline({ - image : path[0], + pics : path, order_type : this.orderType, order_id : this.orderId, }).then(res => { @@ -398,6 +400,11 @@ uni.navigateBack() } }) + }).catch(err => { + wx.showToast({ + title: err.message, + icon : 'none' + }) }) uni.hideLoading() }).catch(err => { diff --git a/pages/user/index.vue b/pages/user/index.vue index 402c0dd..96fd281 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -55,7 +55,13 @@ - + + + + {{freeTitle}} + + + 我的团队 @@ -241,7 +247,8 @@ reckonerQrcode : '', reckonerInvite : '', reckonerPoster : {}, - salesman : '', // 业务联系人 + salesman : '', // 业务联系人 + freeTitle : '' // 自由服务包标题 }; }, onShow() { @@ -410,15 +417,8 @@ title: '加载中...' }) info().then(res => { - console.log(res) - let { - nickname, - identity, - avatar, - certification, - parent,team_name,teams, - salesman - } = res + let { nickname, identity, avatar, certification, parent,team_name,teams, salesman, free } = res + this.freeTitle= free.title this.nickname = nickname this.identity = identity this.avatar = avatar diff --git a/static/icons/user_nav_11.png b/static/icons/user_nav_11.png new file mode 100644 index 0000000000000000000000000000000000000000..14a04c322abc7f0c6cec9fabf2eda08ad0b56163 GIT binary patch literal 5640 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 OY8`D|ZLaJHNd6x`cSoB5 literal 0 HcmV?d00001