Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier_app into test

config/appConfig.js

@@ -1,5 +1,5 @@
 //当前环境 test,prod
-export const ENV = 'prod'
+export const ENV = 'test'
 export const ENV_BASE_URL = {
 	java: {
 		prod: 'https://cashier.sxczgkj.com/',
@@ -102,7 +102,7 @@ const appConfig = {
 	env: {},
 
 	// wss: "wss://sockets.sxczgkj.com/wss", //测试环境
-	wss: returnWss(), //正式环境
+	wss: returnWss(ENV), //正式环境
 	// 环境变量常量
 	ENV_ENUM: {
 		DEVELOPMENT: 'development', // 本地调试地址 

pageMarket/distribution/level-list.vue

@@ -45,7 +45,7 @@
               placeholder-class="color-999 u-font-28"
               type="digit"
               @input="checkNumberCommission($event,index)"
-              v-model="item.levelOneCommission"
+              v-model="item.commission"
             />
             <view class="unit">%</view>
           </view>
@@ -144,7 +144,7 @@ function toggle(index) {
 const allCommission=()=>{
     let sum=0
     for(let item of form.levelConfigList){
-        sum+=parseFloat(item.levelOneCommission)
+        sum+=parseFloat(item.commission)
     }
     return sum
 }
@@ -162,7 +162,7 @@ function checkNumberCommission(e,index){
             icon:'none'
         })
         timer= setTimeout(()=>{
-                 form.levelConfigList[index].levelOneCommission=''
+                 form.levelConfigList[index].commission=''
             },30) 
        
         return false
@@ -172,7 +172,7 @@ function checkNumberCommission(e,index){
         const arr=value.split('.')
         if(arr[1].length>2){
             timer= setTimeout(()=>{
-                form.levelConfigList[index].levelOneCommission=arr[0]+'.'+arr[1].substring(0,2)
+                form.levelConfigList[index].commission=arr[0]+'.'+arr[1].substring(0,2)
             },30)
         }
     }
@@ -200,7 +200,7 @@ function remove(index){
 function addLevelConfig(){
     form.levelConfigList.push({
         name:'',
-        levelOneCommission:'',
+        commission:'',
         inviteCount:'',
         costAmount:''
     })
@@ -217,7 +217,7 @@ function addLevelConfig(){
             })
             return false
         }
-        if(!item.levelOneCommission){
+        if(!item.commission){
             uni.showToast({
                 title:'请输入分成比例',
                 icon:'none'
@@ -279,7 +279,7 @@ onLoad(()=>{
     const levelConfigList=[...distributionStore.config.levelConfigList||[]]
     form.levelConfigList=levelConfigList.length?levelConfigList:[
     {   name:'',
-        levelOneCommission:'',
+        commission:'',
         inviteCount:0,
         costAmount:0}
     ]