0713-0105-h01

src/components/imFloat/imFloat.vue

@@ -26,10 +26,10 @@
                 <el-container>
                     <el-aside width="300px" v-loading="loadMsg">
                         <el-container class="flex-column">
-                            <div class="aside-tabs bg">
+                            <!-- <div class="aside-tabs bg">
                                 <div :class="orderData.tab=='user'?'aside-tab-items active':'aside-tab-items'" @click="handleClick('user')">当前咨询</div>
                                 <div :class="orderData.tab=='order'?'aside-tab-items active':'aside-tab-items'" @click="handleClick('order')">历史咨询</div>
-                            </div>
+                            </div> -->
                             <el-main class="nopadding">
                                 <div class="chat-contact">
                                     <div :class="checkChat==index?'contact-item active':'contact-item'" v-for="(item,index) in chatContact" :key="index" @click="checkChatItem(index)">
@@ -44,7 +44,7 @@
                                             <div class="desc" v-if="item.last.type=='address'">[收集地址]</div>
                                         </div>
                                         <div class="time">
-                                            {{item.last.create_at}}
+                                            {{item.last_time}}
                                         </div>
                                     </div>
                                 </div>
@@ -638,7 +638,7 @@ export default {
          * @param data 
          */
         async sendAddress(data){
-            var orderData = {"img":data.img,"name":"补充收货地址","order":data.out_order_no,"status":0};
+            var orderData = {"img":data.img,"name":"完善会员信息","order":data.out_order_no,"status":0};
             var resp = await this.sendMessageApi("address",orderData);
             if (!resp) {
                 return ;

src/views/merchant/goods/edit.vue

@@ -1,6 +1,9 @@
 <template>
     <el-container>
         <el-main>
+            <div style="margin-bottom: 10px;" v-if="formData.status==4">
+                <el-alert title="驳回原因" show-icon type="error" :closable="false">{{ formData.reason }}</el-alert>
+            </div>
             <el-row :gutter="20">
                 <el-col :span="18">
                     <el-form ref="dialogForm" :model="formData" :rules="rules" label-width="140px" label-position="right">
@@ -633,14 +636,18 @@ export default {
                 label: "name"
             },
             typeData:null,
-            categoryData:[]
+            categoryData:[],
+            optionData:null
         }
     },
     created(){
         this.getData()
         var id = this.$route.query.id;
         var product_id = this.$route.query.product_id;
-        this.getDetail(id,product_id);
+        this.optionData = {
+            id:id,
+            product_id:product_id
+        };
         // this.formData.sold_start_time = this.formattedCurrentDate();
     },
     methods: {
@@ -655,6 +662,7 @@ export default {
         },
         async getDetail(id,product_id){
             var resp = await this.$API.merGoods.detail.get({"id":id,"product_id":product_id});
+            this.showNext = true;
             if (resp.code == 0) {
                 this.$message.error(resp.msg);
                 setTimeout(function(){
@@ -741,12 +749,14 @@ export default {
         },
         async getData(){
             this.channelLoad = true;
+            this.showNext = false;
             var resp = await this.$API.merGoods.category.get();
             this.channelLoad = false;
             if (resp.code == 0) {
                 return this.$message.error(resp.msg)
             }
             this.categoryData = resp.data;
+            this.getDetail(this.optionData.id,this.optionData.product_id);
             // this.getCate()
         },
         async getCate(){