Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

seller/src/views/message/message.vue

@@ -24,11 +24,6 @@
               <Icon v-show="currentMessageType == 'read'" type="md-checkmark"></Icon>
             </transition>
             <span class="mes-type-btn-text">已读消息</span>
-            <Badge
-              class="message-count-badge-outer"
-              class-name="message-count-badge"
-              :count="hasReadCount"
-            ></Badge>
           </div>
         </Button>
       </div>
@@ -39,11 +34,6 @@
               <Icon v-show="currentMessageType == 'recycleBin'" type="md-checkmark"></Icon>
             </transition>
             <span class="mes-type-btn-text">回收站</span>
-            <Badge
-              class="message-count-badge-outer"
-              class-name="message-count-badge"
-              :count="recycleBinCount"
-            ></Badge>
           </div>
         </Button>
       </div>
@@ -98,7 +88,6 @@
 </template>
 
 <script>
-  import Cookies from "js-cookie";
   import * as API_Index from "@/api/index";
 
   export default {
@@ -120,8 +109,6 @@
                 API_Index.read(v.id).then(res => {
                   this.loading = false;
                   if (res.success) {
-                    this.$Message.success("操作成功");
-                    this.currentMessageType = "unread"
                     this.getAll();
                   }
                 });
@@ -148,9 +135,7 @@
                 API_Index.deleteMessage(v.id).then(res => {
                   this.loading = false;
                   if (res.success) {
-                    this.$Message.success("删除成功");
-                    this.currentMessageType = "read"
-                    this.getAll();
+                    this.refreshMessage()
                   }
                 });
               }
@@ -177,9 +162,7 @@
                 API_Index.reductionMessage(v.id).then(res => {
                   this.loading = false;
                   if (res.success) {
-                    this.setCurrentMesType("read");
-                    this.recycleBinCount -= 1
-                    this.hasReadCount +=1
+                    this.refreshMessage()
                   }
                 });
               }
@@ -205,9 +188,7 @@
                 API_Index.clearMessage(v.id).then(res => {
                   this.loading = false;
                   if (res.success) {
-                    this.$Message.success("删除成功");
-                    this.currentMessageType = "recycleBin"
-                    this.getAll();
+                    this.refreshMessage()
                   }
                 });
               }
@@ -390,6 +371,13 @@
       },
       getContent(v) {
         this.mes.content = v.content;
+
+        API_Index.read(v.id).then(res => {
+          this.loading = false;
+          if (res.success) {
+            this.getAll()();
+          }
+        });
       }
     },
     mounted() {

seller/src/views/promotion/coupon/coupon-publish.vue

@@ -38,10 +38,10 @@
                 :max="9.9"
                 :min="0.1"
                 :step="0.1"
+                precision="1"
                 v-model="form.couponDiscount"
-                style="width: 260px">
-              </InputNumber>
-              <span class="describe">请输入0-10之间数字，可以输入一位小数</span>
+                style="width: 260px"/>
+              <span class="describe">请输入0-10的数字,可有一位小数</span>
             </FormItem>
             <FormItem label="面额" prop="price" v-if="form.couponType == 'PRICE'">
               <Input
@@ -256,7 +256,6 @@ export default {
       formRule: {
         promotionName: [{ required: true, message: "活动名称不能为空" }],
         couponName: [{ required: true, message: "优惠券名称不能为空" }],
-        couponLimitNum: [{ required: true, message: "领取限制不能为空" }],
         price: [{ required: true, message: "请输入面额" }, { validator: checkPrice }],
         consumeThreshold: [
           { required: true, message: "请输入消费门槛" },

seller/src/views/promotion/coupon/coupon.vue

@@ -154,10 +154,12 @@ export default {
           key: "price",
           width: 100,
           render: (h, params) => {
-            if (params.row.price) {
+            if (params.row.couponType === "PRICE") {
               return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
-            } else {
+            } else if(params.row.couponType === "DISCOUNT") {
               return h("div", (params.row.couponDiscount || 0) + "折");
+            }else{
+              return h("div", "未知");
             }
           },
         },

seller/src/views/promotion/full-discount/full-discount-add.vue

@@ -38,8 +38,14 @@
                 clearable style="width: 280px" />
             </FormItem>
             <FormItem v-if="form.discountType == 'fullRateFlag'" label="优惠折扣" prop="fullRate">
-              <Input :disabled="form.promotionStatus != 'NEW'" type="text" v-model="form.fullRate" placeholder="优惠折扣"
-                clearable style="width: 280px" />
+              <InputNumber :disabled="form.promotionStatus != 'NEW'"
+                placeholder="优惠折扣"
+                :max="9.9"
+                :min="0.1"
+                :step="0.1"
+                precision="1"
+                v-model="form.fullRate"
+                style="width: 260px"/>
               <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
             </FormItem>
             <FormItem label="额外赠送">