调整业务办理

apis/interfaces/index.js

@@ -164,6 +164,9 @@ const amountType = (bigFive) => {
 
 // 办理业务
 const bigfiveStore = data => {
+	
+	console.log(data)
+	
 	return request({
 		url		: "bigfive/order/store",
 		method	: "POST",

manifest.json

@@ -2,8 +2,8 @@
     "name" : "抖火法律",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.5.3",
+    "versionName" : "1.5.4",
-    "versionCode" : 1053,
+    "versionCode" : 1054,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/business/bigFive.vue

@@ -60,7 +60,6 @@
 				const synthesisObj = this.childrenArr.find(val => val.id === this.businessId)
 				// 办理初始接口
 				bigfiveInit(synthesisObj.id).then(res=>{
-					console.log(synthesisObj.id)
 					this.onNav('businessHandle', { record: encodeURIComponent(JSON.stringify(res)), bigFiveId: synthesisObj.id })
 				}).catch(err=>{
 				    uni.showToast({

pages/business/handle.vue

@@ -11,7 +11,15 @@
 			</view>
 		</view>
 		<view class="from-block">
-			<view class="from-block-item">
+			<view class="from-block-item" v-if="pickertype == 'select'">
+				<label>资费类型</label>
+				<picker class="from-block-val" :range="selectP" :value="selectPIndex" range-key="name" @change="pickerSelectChange">
+					<view class="from-block-picker nowrap">{{selectP[selectPIndex].name}}
+						<u-icon class="from-block-picker-icon" name="arrow-down" color="#555" size="15"></u-icon>
+					</view>
+				</picker>
+			</view>
+			<view class="from-block-item" v-if="needAmount > 0">
 				<label>标的额</label>
 				<input class="from-block-val from-block-input" type="number" placeholder="请输入标的额" @input="onKeyInput" />
 			</view>
@@ -50,13 +58,18 @@
 				phone		: '',
                 price       : '',
 				priceValue  : '',
-				amount      : ''
+				amount      : 0,
+				needAmount	: 0,
+				selectP		: [],
+				selectPIndex: 0
 			};
 		},
 		onShow() {
 			const parentData = JSON.parse(decodeURIComponent(this.$Route.query.record))
+			this.needAmount	 = parentData.need_amount
 			this.pickerArr   = parentData.child.data
 			this.pickertype  = parentData.type
+			this.selectP	 = parentData.select_p
 		},
 		methods: {
 			// 获取标的额
@@ -67,7 +80,11 @@
 			
 			// 标的额比例计算
 			settleInfo() {
-				settleAmount({amount: this.amount}, this.$Route.query.bigFiveId).then(res => {
+				let { pickerArr, pickerIndex } = this
+				let id = pickerArr[pickerIndex].id
+				settleAmount({
+					amount: this.pickertype == 'select' ? this.selectP[this.selectPIndex].key : this.amount,
+				}, id).then(res => {
 					this.price = res.price
 				}).catch(err => {
 					this.price = 0
@@ -80,18 +97,34 @@
 				})
 			},
 			
+			
+			
 			// 选择办理业务
 			pickerChange(e) {
 				this.pickerIndex = e.detail.value
-				
 				// 获取三级分类服务费类型
 				this.amountTypeInfo();
 			},
 			
+			// 选择资费信息
+			pickerSelectChange(e){
+				this.selectPIndex = e.detail.value
+				this.settleInfo()
+			},
+			
 			// 三级分类服务费类型
 			amountTypeInfo() {
-				amountType(this.$Route.query.bigFiveId).then(res => {
+				// this.$Route.query.bigFiveId
-					this.pickertype  = res.type
+				let { pickerArr, pickerIndex } = this
+				let id = pickerArr[pickerIndex].id
+				amountType(id).then(res => {
+					let { type, need_amount, select_p } = res;
+					this.pickertype = type
+					this.needAmount = need_amount
+					this.selectP	= select_p
+					if(type == 'select'){
+						this.settleInfo()
+					}
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,
@@ -104,7 +137,7 @@
 			
 			// 提交表单
 			onSubmit(){
-				let { name, phone, pickerIndex, price, priceValue, amount, pickerArr, pickertype} = this
+				let { name, phone, pickerIndex, price, priceValue, amount, pickerArr, pickertype, selectP, selectPIndex } = this
 				if(pickertype != 'free') {
 					if(amount === ''){
 						uni.showToast({
@@ -144,9 +177,10 @@
 				let params = {
 					big_id  	:   pickerArr.length > 0 ? pickerArr[pickerIndex].id : this.$Route.query.bigFiveId,
 				    name    	:   name,
-					amount  :   amount || '',
+					amount  	:   amount,
 				    mobile  	:   phone,
-				    price   :   pickertype == 'free' ? priceValue : price
+				    price   	:   pickertype == 'free' ? priceValue : price,
+					select_key	: 	selectP[selectPIndex].key
 				}
 				bigfiveStore(params).then(res => {
 					let { order_type, order_id, order_no } = res;

pages/business/info.vue

@@ -13,7 +13,10 @@
 				</view>
 				<view class="infoCont-text">
 					<!-- <view class="infoCont-text-star">★</view> -->
-					<view class="infoCont-text-tips">{{bigFiveInfo.remark}}</view>
+					<!-- <view class="infoCont-text-tips">{{bigFiveInfo.remark}}</view> -->
+					<block v-for="(item,index) in bigFiveInfo.pictures" :key="index">
+						<image style="max-width: 100%; vertical-align: top;" :src="item" mode="widthFix"></image>
+					</block>
 				</view>
 			</view>
 		</view>
@@ -37,6 +40,9 @@
         	// 最新五大板块
         	bigfiveIndex(){
         	    bigfiveInfo(this.$Route.query.bigFive).then(res=>{
+					
+					console.log(res)
+					
 					this.bigFiveInfo = res
         	    }).catch(err=>{
         	        uni.showToast({

yarn.lock

@@ -2,11 +2,29 @@
 # yarn lockfile v1
 
 
-"@babel/parser@^7.18.4":
+"@babel/parser@^7.16.4", "@babel/parser@^7.18.4":
   version "7.20.5"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz"
   integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
 
+"@vue/compiler-core@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz"
+  integrity sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.45"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"
+
+"@vue/compiler-dom@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz"
+  integrity sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==
+  dependencies:
+    "@vue/compiler-core" "3.2.45"
+    "@vue/shared" "3.2.45"
+
 "@vue/compiler-sfc@2.7.14":
   version "2.7.14"
   resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"
@@ -16,21 +34,103 @@
     postcss "^8.4.14"
     source-map "^0.6.1"
 
+"@vue/compiler-sfc@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz"
+  integrity sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.45"
+    "@vue/compiler-dom" "3.2.45"
+    "@vue/compiler-ssr" "3.2.45"
+    "@vue/reactivity-transform" "3.2.45"
+    "@vue/shared" "3.2.45"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+    postcss "^8.1.10"
+    source-map "^0.6.1"
+
+"@vue/compiler-ssr@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz"
+  integrity sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==
+  dependencies:
+    "@vue/compiler-dom" "3.2.45"
+    "@vue/shared" "3.2.45"
+
 "@vue/devtools-api@^6.0.0-beta.11":
   version "6.4.5"
   resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"
   integrity sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==
 
+"@vue/reactivity-transform@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz"
+  integrity sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.45"
+    "@vue/shared" "3.2.45"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+
+"@vue/reactivity@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.45.tgz"
+  integrity sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==
+  dependencies:
+    "@vue/shared" "3.2.45"
+
+"@vue/runtime-core@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.45.tgz"
+  integrity sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==
+  dependencies:
+    "@vue/reactivity" "3.2.45"
+    "@vue/shared" "3.2.45"
+
+"@vue/runtime-dom@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz"
+  integrity sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==
+  dependencies:
+    "@vue/runtime-core" "3.2.45"
+    "@vue/shared" "3.2.45"
+    csstype "^2.6.8"
+
+"@vue/server-renderer@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.45.tgz"
+  integrity sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==
+  dependencies:
+    "@vue/compiler-ssr" "3.2.45"
+    "@vue/shared" "3.2.45"
+
+"@vue/shared@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz"
+  integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==
+
 core-js@^2.6.5:
   version "2.6.12"
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+csstype@^2.6.8:
+  version "2.6.21"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz"
+  integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
+
 csstype@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"
   integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==
 
+estree-walker@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
 eventemitter3@^4.0.7:
   version "4.0.7"
   resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
@@ -41,6 +141,13 @@ lodash-es@^4.17.21:
   resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
 
+magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 moment@^2.29.4:
   version "2.29.4"
   resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
@@ -70,7 +177,7 @@ platform@^1.3.6:
   resolved "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz"
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
 
-postcss@^8.4.14:
+postcss@^8.1.10, postcss@^8.4.14:
   version "8.4.20"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz"
   integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
@@ -89,6 +196,11 @@ source-map@^0.6.1:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
 uni-read-pages@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz"
@@ -120,6 +232,17 @@ vue@^2.6.10:
     "@vue/compiler-sfc" "2.7.14"
     csstype "^3.1.0"
 
+vue@^3.2.0, vue@3.2.45:
+  version "3.2.45"
+  resolved "https://registry.npmjs.org/vue/-/vue-3.2.45.tgz"
+  integrity sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==
+  dependencies:
+    "@vue/compiler-dom" "3.2.45"
+    "@vue/compiler-sfc" "3.2.45"
+    "@vue/runtime-dom" "3.2.45"
+    "@vue/server-renderer" "3.2.45"
+    "@vue/shared" "3.2.45"
+
 vuex@^4.0.2:
   version "4.1.0"
   resolved "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz"