Merge branch 'master' of https://git.bjtdba.com/shop/H5-Merchant

commit/requestPhp.js

@@ -7,7 +7,7 @@ export let baseURL = 'https://testapi.hxxfb.com/'
 const timeout = 50000
 // const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuaHh4ZmIuY29tIiwiYXVkIjoiYXBpLmh4eGZiLmNvbSIsImlhdCI6MTc0MDM3MTM1NSwibmJmIjoxNzQwMzcxMzU1LCJleHAiOjE3NTExNzEzNTUsImp0aSI6WzI5OCwibWVyIl19.j2f8VwdwWY4zBpcijHntzUZ9YUms2SxChaVsYf7KnPs"
 // const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJzaG9wLmh4eGZiLmNvbSIsImF1ZCI6InNob3AuaHh4ZmIuY29tIiwiaWF0IjoxNzQwNTY5NDI3LCJuYmYiOjE3NDA1Njk0MjcsImV4cCI6MTc1MTM2OTQyNywianRpIjpbMzU0LCJtZXIiXX0.aZrICBozUFC0lvqxHgJMKFdhQlDHG1eC9UVAPzDHs5s"
-// const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuaHh4ZmIuY29tIiwiYXVkIjoiYXBpLmh4eGZiLmNvbSIsImlhdCI6MTc0MDU3MTQ0OCwibmJmIjoxNzQwNTcxNDQ4LCJleHAiOjE3NTEzNzE0NDgsImp0aSI6WzM1NCwibWVyIl19.PVwYv71Gq9RxTxQclUoFMgc8cZt0ju3zQkxk6SGCQJw"
+// const token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ0ZXN0YXBpLmh4eGZiLmNvbSIsImF1ZCI6InRlc3RhcGkuaHh4ZmIuY29tIiwiaWF0IjoxNzQxNDA1MzY3LCJuYmYiOjE3NDE0MDUzNjcsImV4cCI6MTc1MjIwNTM2NywianRpIjpbMzEyOSwibWVyIl19.CQ206TpfwaY5mkwiETjAPWExLh1uh4mAf2Vy9uhvTRQ"
 const token = ""
 export const phpToken = uni.getStorageSync('phpToken') || token
 // 需要修改token，和根据实际修改请求头

shop/productManagementModule/addProduct.vue

@@ -594,12 +594,18 @@ export default {
       this.formData.extension_type = val;
       const _this = this;
       this.attrValue[0].modules.forEach((item) => {
-        _this.$set(item, "value", _this.base_commission);
+        if (item.props === "extension_one") {
+          _this.$set(item, "value", _this.base_commission);
+        } else {
+          _this.$set(item, "value", item.value);
+        }
       });
+      this.priceDefault = "0.00"
     },
     changeInputHandle(ev, its, item, idx) {
-      if (its.props == "cost") {
-        let modulesData = item.modules[0];
+      if (its.props == "cost" || its.props == "extension_one") {
+        let modulesData =
+          item.modules.find((item) => item.props == "extension_one") || {};
         let extension_one =
           modulesData.props == "extension_one"
             ? modulesData.value

shop/services/setting.vue

@@ -18,13 +18,13 @@
 			<view class="">
 				商户分润比例
 			</view>
-			<view class="setting-shehi-bili">
-				
-				<!-- <view class="process-zhuti-yi-input"> -->
-					<!-- <picker class="process-zhuti-yi-picker" @change="changeFenRunBiLi" :value="FenRunBiLiListindex" :range="fenRunList" :range-key="'num'"> -->
-						<!-- <view v-if="FenRunBiLiListindex === 1" class="uni-input int-col">30%</view> -->
-			<!-- 			<view class="uni-input">{{fenRunList[FenRunBiLiListindex].num}}</view>
-					</picker> -->
+			<view class="setting-shehi-bili">
+				
+				<!-- <view class="process-zhuti-yi-input"> -->
+					<!-- <picker class="process-zhuti-yi-picker" @change="changeFenRunBiLi" :value="FenRunBiLiListindex" :range="fenRunList" :range-key="'num'"> -->
+						<!-- <view v-if="FenRunBiLiListindex === 1" class="uni-input int-col">30%</view> -->
+			<!-- 			<view class="uni-input">{{fenRunList[FenRunBiLiListindex].num}}</view>
+					</picker> -->
 				<!-- </view> -->
 				<input style="width: 30px;" maxlength="3" v-model="systemConfig.value" value=""
 					@input="inputphone" />%
@@ -45,7 +45,7 @@
 <script>
 	import {
 		queyrConfig,
-		updateShopBonusSetting,
+		updateShopBonusSetting,
 		getShopBonusSetting
 	} from '@/commit/config.js'
 	export default {
@@ -54,27 +54,27 @@
 				// value: "20",
 				systemConfig: [],
 				merid: '',
-				key: "base_commission",
-				
-				fenRunList: [{num:'30%'},{num:'35%'},{num:'40%'},{num:'45%'},{num:'50%'},{num:'55%'},{num:'60%'},{num:'65%'},{num:'70%'},{num:'75%'},{num:'80%'},{num:'85%'},{num:'90%'},{num:'95%'},{num:'100%'}],
-				paramsList:[
-					{shop_bonus_rate:30,yanglao_rate:5},
-					{shop_bonus_rate:35,yanglao_rate:6},
-					{shop_bonus_rate:40,yanglao_rate:7},
-					{shop_bonus_rate:45,yanglao_rate:8},
-					{shop_bonus_rate:50,yanglao_rate:9},
-					{shop_bonus_rate:55,yanglao_rate:10},
-					{shop_bonus_rate:60,yanglao_rate:11},
-					{shop_bonus_rate:65,yanglao_rate:12},
-					{shop_bonus_rate:70,yanglao_rate:13},
-					{shop_bonus_rate:75,yanglao_rate:14},
-					{shop_bonus_rate:80,yanglao_rate:15},
-					{shop_bonus_rate:85,yanglao_rate:16},
-					{shop_bonus_rate:90,yanglao_rate:17},
-					{shop_bonus_rate:95,yanglao_rate:18},
-					{shop_bonus_rate:100,yanglao_rate:19}
-				],
-				FenRunBiLiListindex: 0
+				key: "base_commission",
+				
+				fenRunList: [{num:'30%'},{num:'35%'},{num:'40%'},{num:'45%'},{num:'50%'},{num:'55%'},{num:'60%'},{num:'65%'},{num:'70%'},{num:'75%'},{num:'80%'},{num:'85%'},{num:'90%'},{num:'95%'},{num:'100%'}],
+				paramsList:[
+					{shop_bonus_rate:30,yanglao_rate:5},
+					{shop_bonus_rate:35,yanglao_rate:6},
+					{shop_bonus_rate:40,yanglao_rate:7},
+					{shop_bonus_rate:45,yanglao_rate:8},
+					{shop_bonus_rate:50,yanglao_rate:9},
+					{shop_bonus_rate:55,yanglao_rate:10},
+					{shop_bonus_rate:60,yanglao_rate:11},
+					{shop_bonus_rate:65,yanglao_rate:12},
+					{shop_bonus_rate:70,yanglao_rate:13},
+					{shop_bonus_rate:75,yanglao_rate:14},
+					{shop_bonus_rate:80,yanglao_rate:15},
+					{shop_bonus_rate:85,yanglao_rate:16},
+					{shop_bonus_rate:90,yanglao_rate:17},
+					{shop_bonus_rate:95,yanglao_rate:18},
+					{shop_bonus_rate:100,yanglao_rate:19}
+				],
+				FenRunBiLiListindex: 0
 				
 			}
 		},
@@ -85,7 +85,7 @@
 			this.merid = selectmerchant.merId
 			console.log('xxxxxxxxxxxx')
 			console.log(selectmerchant.merId)
-			this.queyrConfig()
+			this.queyrConfig()
 			this.getFenRun()
 		},
 		methods: {
@@ -105,41 +105,44 @@
 			inputphone(e) {
 				const o = e.target;
 				const inputRule = /[^\d.]/g
+				
 				this.$nextTick(function() {
-					this.systemConfig.value = o.value.replace(inputRule, '');
+					let dataValue = o.value.replace(inputRule, '');
+					this.systemConfig.value = dataValue
+				})
+			},
+			
+			
+			// 切换门店分润比例
+			changeFenRunBiLi(select) {
+				
+				this.FenRunBiLiListindex = select.detail.value;
+				
+			},
+			
+			// 获取门店分润比例
+			getFenRun() {
+				getShopBonusSetting({mer_id: this.merid}).then(res => {
+					console.log('--------xxx>', res.data)
+				}).catch(error => {
+					
 				})
-			},
-			
-			
-			// 切换门店分润比例
-			changeFenRunBiLi(select) {
-				
-				this.FenRunBiLiListindex = select.detail.value;
-				
-			},
-			
-			// 获取门店分润比例
-			getFenRun() {
-				getShopBonusSetting({mer_id: this.merid}).then(res => {
-					console.log('--------xxx>', res.data)
-				}).catch(error => {
-					
-				})
-			},
+			},
 			
-			addto() {
-				
-				let params = {
+			addto() {
+				
+				let params = {
 					// value: JSON.stringify(this.paramsList[this.FenRunBiLiListindex]),
-					value: this.systemConfig.value,
-					mer_id: this.merid
-				}
+					value: this.systemConfig.value,
+					mer_id: this.merid
+				}
 				
 				if(this.systemConfig.value < 5){
 					uni.showToast({
 						title: '不得小于百分之5',
 						icon: "error"
 					})
+					return
 				}
 				
 				if(this.systemConfig.value > 100){
@@ -147,19 +150,20 @@
 						title: '不得大于百分之100',
 						icon: "error"
 					})
+					return
 				}
-				
-				// 修改门店分润值
-				updateShopBonusSetting(params).then(res => {
-					console.log('params = ',params, 'res = ',res)
-					if (res.statusCode == 200) {
-						uni.showToast({
-							title: '设置成功',
-							icon: 'success',
-						})
-					}
-				}, fail => {
-					console.log(fail)
+				
+				// 修改门店分润值
+				updateShopBonusSetting(params).then(res => {
+					console.log('params = ',params, 'res = ',res)
+					if (res.statusCode == 200) {
+						uni.showToast({
+							title: '设置成功',
+							icon: 'success',
+						})
+					}
+				}, fail => {
+					console.log(fail)
 				})
 			},
 			topgi() {