From df35c59b9b2adf67479e12c9cbf0be392a5855c7 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Mon, 9 Dec 2019 18:43:06 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.4.2=20=E5=95=86=E5=93=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=A4=9A=E5=9B=BE=E8=AF=84=E4=BB=B7,=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?,=E5=AF=BC=E5=87=BA=E6=9C=80=E6=96=B0sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/goods/index.vue |  4 ++--
 src/views/shop/order/form.vue  | 18 +++++++++++++++++-
 src/views/shop/reply/index.vue | 24 ++++++++++++++----------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index af03ee1..a8bcf10 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -44,9 +44,9 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT','YXSTOREPRODUCT_DELETE'])" label="操作" width="185px" align="center">
+      <el-table-column v-if="checkPermission(['ADMIN','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT','YXSTOREPRODUCT_DELETE'])" label="操作" width="205px" align="center">
         <template slot-scope="scope">
-          <el-button slot="reference" type="danger"  size="mini" @click="attr(scope.row)">属性</el-button>
+          <el-button slot="reference" type="danger"  size="mini" @click="attr(scope.row)">规格属性</el-button>
           <el-dropdown size="mini" split-button type="primary" trigger="click">
             操作
             <el-dropdown-menu slot="dropdown">
diff --git a/src/views/shop/order/form.vue b/src/views/shop/order/form.vue
index 873f138..02c4e85 100644
--- a/src/views/shop/order/form.vue
+++ b/src/views/shop/order/form.vue
@@ -2,7 +2,14 @@
   <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '去发货'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
       <el-form-item label="快递公司" >
-        <el-input v-model="form.deliveryName" style="width: 370px;"/>
+        <!--<el-input v-model="form.deliveryName" style="width: 370px;"/>-->
+        <el-select v-model="form.deliveryName" filterable placeholder="请选择" style="width: 370px;">
+          <el-option
+            v-for="item in dicts"
+            :key="item.id"
+            :label="item.label"
+            :value="item.id" />
+        </el-select>
       </el-form-item>
       <el-form-item label="快递单号" >
         <el-input v-model="form.deliveryId" style="width: 370px;"/>
@@ -16,8 +23,17 @@
 </template>
 
 <script>
+import initDict from '@/mixins/initDict'
 import { add, edit } from '@/api/yxStoreOrder'
 export default {
+  mixins: [initDict],
+
+  created() {
+    this.$nextTick(() => {
+      // 加载数据字典
+      this.getDict('express_companys')
+    })
+  },
   props: {
     isAdd: {
       type: Boolean,
diff --git a/src/views/shop/reply/index.vue b/src/views/shop/reply/index.vue
index 6a19fd0..0077bbe 100644
--- a/src/views/shop/reply/index.vue
+++ b/src/views/shop/reply/index.vue
@@ -3,15 +3,7 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 新增 -->
-      <div style="display: inline-block;margin: 0px 2px;">
-        <el-button
-          v-permission="['ADMIN','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_CREATE']"
-          class="filter-item"
-          size="mini"
-          type="primary"
-          icon="el-icon-plus"
-          @click="add">新增</el-button>
-      </div>
+
     </div>
     <!--表单组件-->
     <eForm ref="form" :is-add="isAdd"/>
@@ -23,7 +15,16 @@
       <el-table-column prop="productScore" label="商品分数"/>
       <el-table-column prop="serviceScore" label="服务分数"/>
       <el-table-column prop="comment" label="评论内容"/>
-      <el-table-column prop="pics" label="评论图片"/>
+      <el-table-column prop="" label="评论图片">
+        <template slot-scope="scope">
+          <div v-if="scope.row.pics">
+            <a :href="pic" v-for="pic in handlePic(scope.row.pics)" style="color: #42b983" target="_blank">
+              <img :src="pic" alt="点击打开" class="el-avatar">
+            </a>
+          </div>
+          <div v-else>无图</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="addTime" label="评论时间">
         <template slot-scope="scope">
           <span>{{ formatTime(scope.row.addTime) }}</span>
@@ -78,6 +79,9 @@ export default {
     })
   },
   methods: {
+    handlePic(pics) {
+      return pics.split(',')
+    },
     formatTime,
     checkPermission,
     beforeInit() {