0821-0219-h01

src/views/manage/goods/index/components/table.vue

@@ -33,7 +33,11 @@
                         z-index="999"
                         fit="cover"></el-image>
                     </div>
-                    <div class="name">
+                    <div class="name" v-if="scope.row.is_new == 1">
+                        <span>{{ scope.row.price }}元代{{ scope.row.line_price }}元商场权益券{{ scope.row.product_name }}</span>
+                        <span class="dec">商品编码：{{ scope.row.product_id }}</span>
+                    </div>
+                    <div class="name" v-else>
                         <span>{{ scope.row.product_name }}</span>
                         <span class="dec">商品编码：{{ scope.row.product_id }}</span>
                     </div>

src/views/merchant/goods/index/components/table.vue

@@ -22,7 +22,11 @@
                         z-index="999"
                         fit="cover"></el-image>
                     </div>
-                    <div class="name">
+                    <div class="name" v-if="scope.row.is_new == 1">
+                        <span>{{ scope.row.price }}元代{{ scope.row.line_price }}元商场权益券{{ scope.row.product_name }}</span>
+                        <span class="dec">商品编码：{{ scope.row.product_id }}</span>
+                    </div>
+                    <div class="name" v-else>
                         <span>{{ scope.row.product_name }}</span>
                         <span class="dec">商品编码：{{ scope.row.product_id }}</span>
                     </div>

src/views/service/chat/components/asideRight.vue

@@ -187,7 +187,8 @@ export default {
         },
         async getOrderList(){
             this.orderData.loading = true;
-            var resp = await this.$API.merOrder.list.get({"page":this.orderData.page,"pageSize":this.orderData.size,"order":this.orderData.order,"openid":this.chatData.openid});
+            var resp = await this.$API.merOrder.list.get({"page":this.orderData.page,"pageSize":this.orderData.size,"order":this.orderData.order});
+            // var resp = await this.$API.merOrder.list.get({"page":this.orderData.page,"pageSize":this.orderData.size,"order":this.orderData.order,"openid":this.chatData.openid});
             this.orderData.loading = false;
             if (resp.code == 0) {
                 return ;

src/views/service/chat/components/chatBody.vue

@@ -34,7 +34,7 @@
                                             <div class="desc">{{item.content.order?item.content.order:'-'}}</div>
                                         </div>
                                     </div>
-                                    <div class="m-address" v-if="item.msgType == 'order'">
+                                    <div class="m-address" v-if="item.msgType == 'order'" @click="viewOrder(item.content)">
                                         <div class="image"><el-image style="width: 40px;" :src="item.content.img" mode="widthFix"></el-image></div>
                                         <div class="infos">
                                             <div class="title">{{item.content.name}}</div>
@@ -142,6 +142,7 @@
 			<el-button type="primary" :loading="uploading" @click="confirmUpload">确定发送</el-button>
 		</template>
     </el-dialog>
+    <orderDetail ref="orderDetail" @success="orderSuccess"></orderDetail>
     <el-upload ref="uploadRef" action="" :auto-upload="false" :file-list="fileList" :on-change="handleFileChange" :http-request="customUpload" style="display: none" />
 </template>
 
@@ -161,7 +162,11 @@ import { EmojiDecoder, emojiMap } from '@/util/EmojiDecoder.js';
 const emojiUrl = 'https://imgcache.qq.com/open/qcloud/tim/assets/emoji/';
 const decoder = new EmojiDecoder(emojiUrl, emojiMap);
 import { Push } from "@/utils/push";
+import orderDetail from '@/components/imFloat/order';
 export default {
+    components:{
+        orderDetail
+    },
     data () {
         return {
             emojiUrl,
@@ -238,6 +243,10 @@ export default {
         setUserLine(state){
             this.isLineState = state;
         },
+        orderSuccess(){},
+        viewOrder(data){
+            this.$refs.orderDetail.open("add").setData(data)
+        },
         initPush(){
             var _this = this;
             if (!this.pushData.obj) {
@@ -756,6 +765,7 @@ export default {
 
 .m-address{
 	display: flex;align-items: center;gap: 10px;min-width: 260px;
+    cursor: pointer;
 	&.self{
 		transform: rotate(180);
 	}