Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!227

src/views/business/couponPkg/components/CouponAdd.vue

@@ -95,6 +95,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    ids: {
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
@@ -122,7 +126,7 @@ export default {
           "&pageSize=" +
           this.pageParams.pageSize +
           "&",
-        { title: this.couponTitle, status: "on" }
+        { title: this.couponTitle, status: "on", excludeCouponIds: this.ids }
       ).then((res) => {
         this.couponList = res.rows.map((item) => {
           return {

src/views/business/couponPkg/create.vue

@@ -47,7 +47,7 @@
         </el-table-column>
       <el-table-column v-if="!readonly" prop="date" label="操作" align="center">
         <template slot-scope="{ $index }">
-          <el-button type="text" class="del" @click="couponPkgItemList.splice($index, 1);getPrice();getCouponNum()">删除</el-button>
+          <el-button type="text" class="del" @click="couponPkgItemList.splice($index, 1);getIds();getPrice();getCouponNum()">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -60,7 +60,7 @@
     </el-row>
     
     <!-- 添加券 -->
-    <coupon-add :dialog-visible="couponTableVisible" @close="couponTableVisible = false" @confirmCoupon="confirmCoupon" v-if="couponTableVisible" />
+    <coupon-add :dialog-visible="couponTableVisible" :ids="ids" @close="couponTableVisible = false" @confirmCoupon="confirmCoupon" v-if="couponTableVisible" />
   </div>
 </template>
 <script>
@@ -80,6 +80,7 @@ export default {
       couponPkgItemList: [],
       totalPrice: 0,
       totalCouponNum: 0,
+      ids: [],
       addIng: false,
       rules: {
         title: [{ required: true, message: '请输入券包名称', trigger: 'blur' }]
@@ -93,6 +94,7 @@ export default {
         this.addData = { title }
         this.totalPrice = facePrice
         this.totalCouponNum = couponNum
+        this.ids = couponPkgItemVOList.map(item => item.couponId)
         this.couponPkgItemList = couponPkgItemVOList.map(item => {
           return {
             ... item, 
@@ -105,6 +107,7 @@ export default {
   methods: {
     confirmCoupon(arr) {
       this.couponPkgItemList = this.couponPkgItemList.concat(arr)
+      this.getIds()
       this.getPrice()
       this.getCouponNum()
     },
@@ -127,6 +130,10 @@ export default {
       this.totalPrice = num
     },
 
+    getIds() {
+      this.ids = this.couponPkgItemList.map(item => item.couponId)
+    },
+
     getCouponNum() {
       let num = 0
       this.couponPkgItemList.forEach(item => {

src/views/order/channel/detail.vue

@@ -58,6 +58,18 @@
         </div>
       </div>
     </div>
+    <!-- 买家留言 -->
+    <div class="info">
+      <div class="info-title">备注信息</div>
+      <div class="info-item">
+        <div class="info-item-content">
+          <div class="info-item-content-one">
+            <div class="title">买家留言：</div>
+            <div class="txt">{{ info.memo || "--" }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
     <!-- 订单状态 -->
     <div class="info">
       <div class="info-title">订单状态</div>

src/views/order/deliver/detail.vue

@@ -54,6 +54,18 @@
         </div>
       </div>
     </div>
+    <!-- 买家留言 -->
+    <div class="info">
+      <div class="info-title">备注信息</div>
+      <div class="info-item">
+        <div class="info-item-content">
+          <div class="info-item-content-one">
+            <div class="title">买家留言：</div>
+            <div class="txt">{{ status.memo || "--" }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
     <!-- 订单状态 -->
     <div class="info">
       <div class="info-title">订单状态</div>