Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-ui-pc into dev

src/views/business/coupon/index.vue

@@ -37,7 +37,7 @@
           size="mini"
           @click="$router.push({ name: 'CouponAdd' })"
           v-hasPermi="['business:coupon:add']"
-        >添加优惠券</el-button>
+        >生成优惠券</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

src/views/order/deliver/detail.vue

@@ -233,7 +233,6 @@ export default {
         if (res.code == 0) {
           this.info = res.data;
           this.status = JSON.parse(res.data.status);
-          console.log(this.status)
           res.data.deliverList &&
             res.data.deliverList.forEach((item) => {
               item.items.forEach((ele) => {