抖火调整自由服务包

apis/index.js

@@ -10,8 +10,8 @@ import router from '../router'
 
 // 基础配置
 const config = {
-	// apiUrl	: 'https://douhuo.douhuofalv.com/api/',
+	apiUrl	: 'https://douhuo.douhuofalv.com/api/',
-	apiUrl	: 'https://douhuo.demos.uzchain.tech/api/', //测试环境
+	// apiUrl	: 'https://douhuo.demos.uzchain.tech/api/', //测试环境
 	timeout	: 60000
 }
 

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特有相关 */

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",

pages/business/handle.vue

@@ -28,7 +28,7 @@
 				<input class="from-block-val from-block-input" type="number" placeholder="请输入客户手机号码" v-model="phone" maxlength="11" />
 			</view>
 			<view class="from-block-item" v-if="needAmount > 0">
-				<label>标的额</label>
+				<label>{{priceTitle}}</label>
 				<input class="from-block-val from-block-input" type="number" v-model="amount" placeholder="请输入标的额"/>
 			</view>
 			<view class="from-block-item from-block-get" v-if="pickertype != 'free'">
@@ -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,

pages/business/info.vue

@@ -7,7 +7,7 @@
 				<image class="infoCont-hot" src="https://douhuo-storage.oss-cn-beijing.aliyuncs.com/images/2024/02/20/053632a2a4c63fd50a0f2cde9835a152.png" mode="widthFix"></image>
 				<image class="infoCont-seal" src="https://douhuo-storage.oss-cn-beijing.aliyuncs.com/images/2024/02/20/2df98978be66b60985c88eea95f091e5.png" mode="widthFix"></image>
 				<view class="infoCont-title">{{bigFiveInfo.title}}</view>
-				<view class="infoCont-text">
+				<view class="infoCont-text" v-if="bigFiveInfo.subtitle != ''">
 					<view class="infoCont-text-star">★</view> 
 					<view class="infoCont-text-subtitle">{{bigFiveInfo.subtitle}}</view>
 				</view>
@@ -15,7 +15,7 @@
 					<!-- <view class="infoCont-text-star">★</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>
+						<image style="max-width: 100%; vertical-align: top;" :src="item" @click="onOpenImg(index)" mode="widthFix"></image>
 					</block>
 				</view>
 			</view>
@@ -52,7 +52,14 @@
         	            duration:2000
         	        })
         	    })
-        	},
+        	},
+			// 查看图片
+			onOpenImg(index){
+				wx.previewImage({
+					urls	: this.bigFiveInfo.pictures,
+					current	: this.bigFiveInfo.pictures[index]
+				})
+			}
         }
 	}
 </script>

pages/pay/pay.vue

@@ -376,17 +376,19 @@
 			// 上传打款凭证
 			onOffline(){
 				uni.chooseImage({
-					count: 1,
+					count: 4,
 					success: path => {
-						console.log('这是成功的')
 						let { tempFiles } = path;
-						uploads([{
+						let paths = tempFiles.map(val => {
-							name: 'file' + tempFiles[0].size,
+							return {
-							uri : tempFiles[0].path
+								name: 'file' + val.size,
-						}], {}).then(updRes => {
+								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 => {

pages/user/index.vue

@@ -55,7 +55,13 @@
             </view>
             <u-icon name="arrow-right" color="#cacaca" size="34rpx" bold></u-icon>
         </view>
-        <view class="border-solid-empty"></view>
+        <view class="border-solid-empty"></view>
+		<view class="nav-flex" @click="onNav('FreeService')" v-if="isAuth">
+		    <view class="nav-icon">
+		        <image class="nav-icon-src" src="@/static/icons/user_nav_11.png"></image>{{freeTitle}}
+		    </view>
+		    <u-icon name="arrow-right" color="#cacaca" size="34rpx" bold></u-icon>
+		</view>
         <view class="nav-flex" @click="onNav('UserTeam')">
             <view class="nav-icon">
                 <image class="nav-icon-src" src="@/static/icons/user_nav_02.png"></image>我的团队
@@ -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, free } = res
-                    let {
+					this.freeTitle= free.title
-                        nickname,
-                        identity,
-                        avatar,
-                        certification,
-                        parent,team_name,teams,
-						salesman
-                    } = res
                     this.nickname = nickname
                     this.identity = identity
                     this.avatar = avatar