From 81ab58e009a2c8f24d2c3f991b6e67ce30eff471 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Wed, 11 Aug 2021 22:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=85=A5=E9=A9=BBbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/shopEntry/FirstApply.vue        |  2 +-
 buyer/src/pages/shopEntry/ShopEntry.vue         | 15 +++++++++------
 buyer/src/pages/shopEntry/ThirdApply.vue        |  2 +-
 .../setting-manage/setting/ORDER_SETTING.vue    | 11 ++++++-----
 .../setting-manage/setting/POINT_SETTING.vue    | 17 +++++++++--------
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/buyer/src/pages/shopEntry/FirstApply.vue b/buyer/src/pages/shopEntry/FirstApply.vue
index a2d0aed8..a83ccb65 100644
--- a/buyer/src/pages/shopEntry/FirstApply.vue
+++ b/buyer/src/pages/shopEntry/FirstApply.vue
@@ -79,7 +79,7 @@
         <Input
           type="textarea"
           v-model="form.scope"
-          maxlength="300"
+          maxlength="200"
           show-word-limit
           :rows="4"
           placeholder="请输入营业执照所示经营范围"
diff --git a/buyer/src/pages/shopEntry/ShopEntry.vue b/buyer/src/pages/shopEntry/ShopEntry.vue
index 149ee134..1c622e2c 100644
--- a/buyer/src/pages/shopEntry/ShopEntry.vue
+++ b/buyer/src/pages/shopEntry/ShopEntry.vue
@@ -68,7 +68,7 @@ export default {
         this.agreementCon = res.result.content;
       });
     },
-    getData () { // 获取已填写店铺信息
+    getData (status) { // 获取已填写店铺信息
       applyStatus().then((res) => {
         if (res.success) {
           if (!res.result) {
@@ -122,9 +122,12 @@ export default {
             third.forEach((e) => {
               this.thirdData[e] = data[e];
             });
-
-            if (this.storeDisable !== 'APPLY') {
-              this.currentIndex = 3;
+            if (status === 'init') {
+              if (this.storeDisable === 'APPLY') {
+                this.currentIndex = 0;
+              } else {
+                this.currentIndex = 3;
+              }
             }
             this.$nextTick(() => {
               this.dataReview = true;
@@ -137,11 +140,11 @@ export default {
     // 下一步
     nextPage (step) {
       this.currentIndex = step;
-      this.getData()
+      this.getData('next')
     }
   },
   mounted () {
-    this.getData();
+    this.getData('init');
     this.getArticle();
   }
 };
diff --git a/buyer/src/pages/shopEntry/ThirdApply.vue b/buyer/src/pages/shopEntry/ThirdApply.vue
index 15167274..42928161 100644
--- a/buyer/src/pages/shopEntry/ThirdApply.vue
+++ b/buyer/src/pages/shopEntry/ThirdApply.vue
@@ -90,7 +90,7 @@
         <Input
           type="textarea"
           v-model="form.storeDesc"
-          maxlength="300"
+          maxlength="200"
           show-word-limit
           :rows="4"
           placeholder="请输入店铺简介"
diff --git a/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
index 1cb71612..4d051c51 100644
--- a/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
@@ -6,32 +6,33 @@
         <Input type='number' v-model="formValidate.autoCancel">
         <span slot="append">分</span>
         </Input>
+        <span class="desc">发起订单后，多少分钟未操作取消订单</span>
       </FormItem>
 
       <FormItem label="订单自动收货" class="label-item" prop="autoReceive">
         <Input type='number' v-model="formValidate.autoReceive">
         <span slot="append">天</span>
         </Input>
-        <span class="desc">收货后，订单完成</span>
+        <span class="desc">发货后多少天自动完成收货</span>
       </FormItem>
 
-      <FormItem label="自动评价" prop="autoEvaluation">
+      <FormItem label="自动好评" prop="autoEvaluation">
         <Input type='number' v-model="formValidate.autoEvaluation">
         <span slot="append">天</span>
         </Input>
-
+        <span class="desc">订单发货后，多少天后自动好评</span>
       </FormItem>
       <FormItem label="已完成订单允许退单" prop="closeAfterSale">
         <Input type='number' v-model="formValidate.closeAfterSale">
         <span slot="append">天</span>
         </Input>
-        <span class="desc">如果天数为0,则不允许退单</span>
+        <span class="desc">订单完成后，多少天内允许退单，如果天数为0,则不允许退单</span>
       </FormItem>
       <FormItem label="已完成订单允许投诉" prop="closeComplaint">
         <Input type='number' v-model="formValidate.closeComplaint">
         <span slot="append">天</span>
         </Input>
-        <span class="desc">如果天数为0,则不允许投诉</span>
+        <span class="desc">订单完成后，多少天内允许投诉，如果天数为0,则不允许投诉</span>
       </FormItem>
 
       <div class="label-btns">
diff --git a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
index f14dd876..11e6e63e 100644
--- a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="layout">
     <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
-      <FormItem label="积分比例" prop="money">
+      <FormItem label="积分比率" prop="money">
         <Input type="number" v-model="formValidate.money">
-        <span slot="prepend">1积分=</span>
-        <span slot="append">人民币</span>
+          <span slot="prepend">1积分=</span>
+          <span slot="append">人民币</span>
         </Input>
-
+        
       </FormItem>
 
       <FormItem label="注册账号" prop="register">
@@ -14,13 +14,13 @@
         <span slot="append">积分</span>
         </Input>
       </FormItem>
-      <FormItem label="登录" class="label-item" prop="login">
+      <!-- <FormItem label="登录" class="label-item" prop="login">
         <Input type="number" v-model="formValidate.login">
 
         <span slot="append">积分</span>
         </Input>
 
-      </FormItem>
+      </FormItem> -->
 
       <FormItem label="每日签到积分" prop="signIn">
         <Input type="number" v-model="formValidate.signIn">
@@ -38,11 +38,12 @@
       <FormItem class="label-item" v-for="(point,index) in  formValidate.pointSettingItems" :key="index" :label="'签到设置'+(index+1)">
         <div class="label-item">
 
-          <InputNumber :min="1" v-model="point.day" :formatter="value => `签到${value}天`" :parser="value => value.replace('天', '') && value.replace('签到', '')"></InputNumber>
+          <InputNumber :min="1" v-model="point.day"></InputNumber>
 
-          <InputNumber :min="0" :formatter="value => `赠送${value}积分`" :parser="value => value.replace('积分', '') && value.replace('赠送', '')" v-model="point.point"></InputNumber>
+          <InputNumber :min="0"  v-model="point.point"></InputNumber>
 
           <Button ghost type="error" @click="delSign(point,index)">删除</Button>
+          <span class="ml_10">签到<span class="theme_color">{{point.day}}</span>天，赠送<span class="theme_color">{{point.point}}</span>积分</span>
         </div>
 
       </FormItem>