fix：“优化优惠码功能页面”

src/assets/language/en.json

@@ -309,7 +309,7 @@
     "deletionSucceeded": "Deletion succeeded",
     "commonOperations": "Remote operating equipment",
     "equipmentNo": "Equipment No",
-    "restart": "Restart device",
+    "restart": "Reset machine",
     "restartFurnaceHead": "Restart furnace head",
     "sleep": "sleep",
     "openCloseFurnaceHead": "Open/close furnace head",
@@ -551,6 +551,7 @@
     "export": "export",
     "apply": "apply",
     "discount": "discount",
+    "deduction": "deduction",
     "termOfValidity": "Valid until",
     "expired": "(Expired)",
     "validDays": "Valid days",
@@ -576,7 +577,7 @@
     "theNumberOfDiscountCodesCannotExceed": "The number of discount codes cannot exceed 200",
     "theValidityPeriodCannotExceedMonths": "The validity period cannot exceed 3 months",
     "discountCannotBeGreaterThan": "Discount cannot be greater than 10",
-    "successfulProductionOfDiscountCode": "Successful production of discount code",
+    "successfulProductionOfDiscountCode": "Application successful",
     "applDiscCode": "Apply for discount code"
   },
   "distributionSet": {

src/assets/language/zh.json

@@ -306,7 +306,7 @@
     "deletionSucceeded": "删除成功",
     "commonOperations": "远程操作设备",
     "equipmentNo": "设备编号",
-    "restart": "重启设备",
+    "restart": "机器复位",
     "restartFurnaceHead": "重启炉头",
     "sleep": "睡眠",
     "openCloseFurnaceHead": "开启/关闭炉头",
@@ -552,6 +552,7 @@
     "export": "导出",
     "apply": "申请",
     "discount": "折扣",
+    "deduction": "抵扣",
     "termOfValidity": "有效期至",
     "expired": "(已过期)",
     "validDays": "有效天数",
@@ -577,7 +578,7 @@
     "theNumberOfDiscountCodesCannotExceed": "优惠码个数不能超过200",
     "theValidityPeriodCannotExceedMonths": "有效期不能超过3个月",
     "discountCannotBeGreaterThan": "折扣不能大于10",
-    "successfulProductionOfDiscountCode": "生产优惠码成功",
+    "successfulProductionOfDiscountCode": "申请成功",
     "applDiscCode": "申请优惠码"
   },
   "distributionSet": {

src/views/discountCode/index.vue

@@ -37,7 +37,7 @@
           <div v-for="(item, index) in discountCodeList" :key="index" class="listItem" @click="disCountCodeClick(item)">
             <div class="itemBox">
               <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.discountCode') }}:&nbsp;</span>{{ item.code
-              }}<span class="itemTitle discount">{{ $t('discountCode.discount') }}:&nbsp;</span>{{ item.discount }}
+              }}<span class="itemTitle discount">{{ item.type == '1' ? $t('discountCode.deduction') : $t('discountCode.discount') }}:&nbsp;</span>{{ item.discount }}
               </div>
               <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.creationTime') }}:&nbsp;</span>{{
                 showDateTime(item.createDate) }}</div>

src/views/discountCode/payCode.vue

@@ -35,7 +35,7 @@
             <span>0-10</span>
           </template>
         </van-field>
-        <div class="van-cell van-field" v-if='type === "0" && discount === "0"'>
+        <div class="van-cell van-field" v-if='type === "0" && discount === "0" && promoCodeOpen != "0"'>
           <div class="van-cell__title van-field__label"><span>{{ $t('discountCode.paymentMethod') }}</span></div>
           <div class="van-cell__value van-field__value radioBox">
             <van-radio-group v-model="frpCode" direction="horizontal">
@@ -85,6 +85,8 @@ export default {
     });
     const payCodeType = ref(false);
     const ewmObj = ref(null);
+    const promoCodeOpen = ref(''); // 0折优惠码开通状态
+
 
     // 初始化页面
     onMounted(async () => {
@@ -97,7 +99,11 @@ export default {
       payParams.discount = '';
       payParams.frpCode = 'WEIXIN_NATIVE';
       const user = getLoginUser();
-      if (user) { payParams.adminId = user.id; }
+      if (user) { 
+        payParams.adminId = user.id;
+        promoCodeOpen.value = user.promoCodeOpen;
+        // console.log("promoCodeOpen",promoCodeOpen.value);
+      }
     });
 
     // 提交搜索表单触发搜索
@@ -110,19 +116,27 @@ export default {
       if (parseInt(payParams.month) > 3) { showFailToast(t('discountCode.theValidityPeriodCannotExceedMonths')); return; }
       if (payParams.type === '0' && parseInt(payParams.discount) > 10) { showFailToast(t('discountCode.discountCannotBeGreaterThan')); return; }
       const { data } = await addCode(Object.assign({}, payParams));
-      if (payParams.type === '0') {
+      if (payParams.type === '0' && payParams.discount === '0' && promoCodeOpen.value != '0') {
+        // console.log("data", data);
         ewmObj.value = data.data;
         payCodeType.value = true;
       } else {
+        // console.log("data", data);
         if (data.code === '00000') {
           showSuccessToast(t('discountCode.successfulProductionOfDiscountCode'));
-          router.push({ path: '/discountCode' });
+          // router.push({ path: '/discountCode' });
+          setTimeout(() => {
+            router.go(-1);
+          }, 1500);
         } else {
           showFailToast(data.message);
         }
       }
     }
-    const payCodeClose = () => { router.push({ path: '/discountCode' }); }
+    const payCodeClose = () => {
+      // router.push({ path: '/discountCode' }); 
+      router.go(-1);
+    }
     // 有效天数
     const validDays = ref('0天');
     // 监听有效期，计算有效天数
@@ -136,6 +150,7 @@ export default {
       onSubmit,
       payCodeClose,
       validDays,
+      promoCodeOpen
     };
   },
 };

src/views/merchantManage/set.vue

@@ -124,7 +124,7 @@
             <div v-if="adminType < 2">
               <span class="word12">{{ $t('merchantManage.joinpayMch') }}：{{ adminMchObj.signStatus == '签约成功' ?
                 adminMchObj.signStatus : '未签约' }}</span>
-              <span class="word12">{{ $t('merchantManage.huifuMch') }}：{{ huifuMchObj.status == '2' ? '签约成功' : '未签约' }}</span>
+              <span class="word12">{{ $t('merchantManage.huifuMch') }}：{{ huifuMchObj != null && huifuMchObj.status == '2' ? '签约成功' : '未签约' }}</span>
             </div>
           </div>
         </div>
@@ -178,19 +178,22 @@ export default {
           adminObj.value.promoCodeOpen = '1';
         }
         ifForeign.value = data.data.ifForeign;
-      } else { showFailToast(data.message); }
-      console.log('getAdminFun', data);
+      } 
+      // else { showFailToast(data.message); }
+      // console.log('getAdminFun', data);
     };
     const getAdminMchFun = async () => {
       const { data } = await getAdminMch({ id: merchantId.value });
-      if (data.code === "00000") { adminMchObj.value = data.data; } else { showFailToast(data.message); }
-      console.log('getAdminMchFun', data);
-      console.log('adminMchObj', adminMchObj.value.signStatus);
+      if (data.code === "00000") { 
+        adminMchObj.value = data.data; 
+      }
+      // console.log('getAdminMchFun', data);
+      // console.log('adminMchObj', adminMchObj.value.signStatus);
     }
     const getHuifuMchFun = async () => {
       const { data } = await getHuifuMch({ adminId: merchantId.value });
-      if (data.code === "00000") { huifuMchObj.value = data.data; } else { showFailToast(data.message); }
-      console.log('getHuifuMchFun', data);
+      if (data.code === "00000") { huifuMchObj.value = data.data; }
+      // console.log('getHuifuMchFun', data);
     }
     const onSubmit = async () => {
       const params = {

src/views/orderCenter/index.vue

@@ -643,7 +643,7 @@ export default {
 
     // 跳转订单导出
     const gotoOrderExcel = async () => {
-      if (searchParams.type == null ) {
+      if (searchParams.type == null || searchParams.type == '' ) {
         searchParams.type = user.ifForeign;
       }
       console.log("searchParams", searchParams);

src/views/popPayment.vue

@@ -58,6 +58,9 @@ export default {
 
         };
         const showSugarPhoto = (no) => {
+            if (no == 'A99') {
+                return require(`../assets/order/spunSugar/goods/A30.png`);
+            }
             return require(`../assets/order/spunSugar/goods/${no}.png`);
         };
         const wxPay = () => {

src/views/settlement/index.vue

@@ -53,7 +53,7 @@
           <div class="van-cell van-field requiredLeft">
             <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.merchantType') }}</span></div>
             <div class="van-cell__value van-field__value radioBox">
-              <van-radio-group v-model="altMerchantType" direction="horizontal" @change="fieldUpdate">
+              <van-radio-group v-model="altMerchantType" direction="horizontal" @change="fieldUpdate" :disabled="huifuMchID != null || joinPayMchID != null">
                 <van-radio name="10" icon-size="18px">{{ $t('joinpayMch.personal') }}</van-radio>
                 <!-- <van-radio name="11" icon-size="18px">{{$t('joinpayMch.individualBusinesses')}}</van-radio> -->
                 <van-radio name="12" icon-size="18px">{{ $t('joinpayMch.enterprise') }}</van-radio>
@@ -186,7 +186,8 @@
                 {{ signStatus == '签约成功' ? (huifuMchID == null ? signStatus : (huifuAuditStatus == '2' ? signStatus :
                   '待签约')) : '待签约' }}
               </span>
-              <van-button span="5" round type="primary" style="height: 2em; padding: 0 2.5em" @click='altMchSignFun()'>{{
+              <van-button :disabled="huifuMchID == null ? (signStatus == '签约成功' ? true : false) : (huifuAuditStatus == '2' && signStatus == '签约成功' ? true : false)"
+               span="5" round type="primary" style="height: 2em; padding: 0 2.5em" @click='altMchSignFun()'>{{
                 $t('joinpayMch.signAContract') }}
               </van-button>
             </div>
@@ -196,9 +197,9 @@
           <div class="van-cell van-field requiredLeft">
             <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.accountType') }}</span></div>
             <div class="van-cell__value van-field__value radioBox">
-              <van-radio-group v-model="bankAccountType" direction="horizontal" @change="fieldUpdate">
+              <van-radio-group v-model="bankAccountType" direction="horizontal" @change="fieldUpdate" :disabled="altMerchantType === '10'">
                 <van-radio name="1" icon-size="18px">{{ $t('joinpayMch.debitCard') }}</van-radio>
-                <van-radio :disabled="altMerchantType === '10'" name="4" icon-size="18px">{{
+                <van-radio name="4" icon-size="18px">{{
                   $t('joinpayMch.corporateAccount')
                 }}</van-radio>
               </van-radio-group>