From a3ede4ccecd98b6a7f113c322b70223dbcf0f8ff Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Thu, 6 Feb 2020 11:54:52 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.9.4,=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=99=AE=E9=80=9A=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=8F=8A=E5=85=B6=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=85=B6=E4=BB=96=E9=97=AE=E9=A2=98,=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=99=BB=E9=99=86=E6=BC=94=E7=A4=BA=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activity/bargain/index.vue | 18 ++++---
 src/views/dashboard/YshopInfo.vue    | 78 ++++++++++++++++++----------
 src/views/shop/user/index.vue        | 27 +++++++++-
 3 files changed, 86 insertions(+), 37 deletions(-)

diff --git a/src/views/activity/bargain/index.vue b/src/views/activity/bargain/index.vue
index 7da9b03..9585e77 100644
--- a/src/views/activity/bargain/index.vue
+++ b/src/views/activity/bargain/index.vue
@@ -9,16 +9,20 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="id" label="砍价产品ID" />
-      <el-table-column prop="title" label="砍价标题" />
-      <el-table-column prop="info" label="砍价简介" />
+      <el-table-column prop="title" label="砍价名称" />
       <el-table-column prop="image" label="砍价图片">
         <template slot-scope="scope">
           <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
         </template>
       </el-table-column>
-      <el-table-column prop="unitName" label="单位名称" />
-      <el-table-column prop="stock" label="库存" />
-      <el-table-column prop="sales" label="销量" />
+      <el-table-column prop="price" label="砍价价格"/>
+      <el-table-column prop="price" label="砍价区间">
+        <template slot-scope="scope">
+          <span>{{ scope.row.bargainMinPrice }}~{{ scope.row.bargainMaxPrice }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="minPrice" label="最低价"/>
+      <el-table-column prop="stock" label="库存"/>
       <el-table-column prop="startTime" label="开始时间">
         <template slot-scope="scope">
           <span>{{ formatTimeTwo(scope.row.startTime) }}</span>
@@ -29,10 +33,10 @@
           <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
         </template>
       </el-table-column>
-      <!--      <el-table-column prop="storeName" label="砍价产品名称"/>-->
+      <el-table-column prop="sales" label="销量" />
       <el-table-column prop="look" label="浏览量" />
       <el-table-column prop="share" label="分享量" />
-      <el-table-column v-if="checkPermission(['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT','YXSTOREBARGAIN_DELETE'])" label="操作" width="150px" align="center">
+      <el-table-column v-if="checkPermission(['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT','YXSTOREBARGAIN_DELETE'])" label="操作" width="150px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="['admin','YXSTOREBARGAIN_ALL','YXSTOREBARGAIN_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
           <el-popover
diff --git a/src/views/dashboard/YshopInfo.vue b/src/views/dashboard/YshopInfo.vue
index deaf017..29ef191 100644
--- a/src/views/dashboard/YshopInfo.vue
+++ b/src/views/dashboard/YshopInfo.vue
@@ -32,6 +32,9 @@
           <div class="text item">
             <span style="font-weight: bolder">公众号演示：</span><img width="100" height="100" src="https://image.dayouqiantu.cn/qrcode_for_gh_95df5a2881cc_258.jpg">
           </div>
+          <div class="text item">
+            <span style="font-weight: bolder">小程序演示：</span>关注上面公众号之后，选择yshop小程序体验即可
+          </div>
           <div class="text item">
             <span style="font-weight: bolder">H5演示：</span><a target="_blank" href="https://h5.dayouqiantu.cn">https://h5.dayouqiantu.cn</a> <br />
             <span style="font-weight: bolder">H5测试号</span>：hupeng/123456,也可以自行注册
@@ -51,27 +54,25 @@
             当然，您也可以对它进行深度定制，以做出更强系统。
           </div>
           <div class="text item">
-            <span style="font-weight: bolder">VIP版：</span>包括了开源版，还包括了移动端、移动端API
+            <span style="font-weight: bolder">VIP版(JAVA++H5+公众号端)：</span>包括了开源版，还包括了移动端、移动端API
           </div>
           <div class="text item">
-            1、VIP为终身制、拥有全部源代码及其后续的代码（免费）升级及其技术支持。目前商城优惠券、会员、秒杀、分销、砍价等都已经完成！<br />
+            1、VIP为终身制包括JAVA端+H5公众号端，后期免费升级迭代及其技术支持。！<br />
             2、价格：vip会员价228元(JAVA+H5+公众号版)，后续的系统升级vip价格会有相应的调整的，所以早上车更优惠哦！<br />
             3、VIP购买淘宝地址：https://item.taobao.com/item.htm?id=607532386325<br />
             4、加入vip群：931426444,请输入你的淘宝订单编号，即可入群<br />
             5、群里面获取私服git<br />
-            <!--6、如果需要小程序需要单独购买看下面<br />-->
-            此版本小程序(mpvue2框架开发)已经发布了一个开发版，加入vip私服git获取演示还没正式上线，大家要早上车早划算，
-            小程序正式上演示版就表示正式发布，即小程序需要单独购买了<br />
-          </div>
-          <!--<div class="text item">-->
-            <!--<span style="font-weight: bolder">VIP版如果需要小程序需要另外单独购买：-->
-          <!--</div>-->
-          <!--<div class="text item">-->
-            <!--1、小程序是mpvue框架开发<br />-->
-            <!--2、价格：100元，只是单独的小程序！<br />-->
-            <!--3、购买淘宝地址：https://item.taobao.com/item.htm?id=608056803568<br />-->
-            <!--4、群里面获取私服git<br />-->
-          <!--</div>-->
+            6、如果需要小程序需要单独购买看下面<br />
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">VIP版如果需要小程序需要另外单独购买：</span>
+          </div>
+          <div class="text item">
+            1、小程序是mpvue2.0框架开发<br />
+            2、价格：100元，只是单独的小程序！购买小程序请务必要购买上面VIP套餐<br />
+            3、购买淘宝地址：https://item.taobao.com/item.htm?id=608056803568<br />
+            4、群里面获取私服git<br />
+          </div>
         </el-card>
       </div>
     </el-col>
@@ -82,43 +83,64 @@
             <span style="font-weight: bolder">更新日志</span>
           </div>
           <div class="text item">
-            <span style="font-weight: bolder">（2020-01-31）yshop1.9.2版本 发布更新如下：</span>
+            <span style="font-weight: bolder">（2020-02-06）yshop1.9.4版本 发布更新如下：</span>
           </div>
           <div class="text item">
-            1.修复素材库无法分页的问题#I18KJN
+            1.后台砍价列表显示调整
           </div>
           <div class="text item">
-            2.修复订单退款问题#I18GG6
+            2.后台会员新增用户来源
           </div>
           <div class="text item">
-            3.修复分类问题#I17UEI
+            3.小程序新增普通二维码功能
           </div>
           <div class="text item">
-            4.修复后台添加角色的问题#I18NCW
+            4.修复小程序砍价海报问题
           </div>
           <div class="text item">
-            5.修复H5登陆提示信息不一致#I18GZW
+            5.修复小程序首页滚动新闻不显示的问题
+          </div>
+          <div class="text item">
+            6.修复小程序个人中心积分列表问题
+          </div>
+          <div class="text item">
+            7.修复小程序购物车删除问题#I19176
           </div>
           <div class="text item">
-            <span style="font-weight: bolder">（2020-01-20）yshop1.9.1版本 发布更新如下：</span>
+            <span style="font-weight: bolder">（2020-02-04）yshop1.9.3版本 发布更新如下：</span>
           </div>
           <div class="text item">
-            1.新增城市接口
+            1.修复购物车列表问题
           </div>
           <div class="text item">
-            2.修复小程序登陆与支付问题
+            2.修复后台图文管理时间显示问题
           </div>
           <div class="text item">
-            3.发布mpvue1.0小程序（目前开发版本,已经上传到私服git）
+            3.修复砍价增加商品问题
           </div>
           <div class="text item">
-            4.WxJava升级到3.6
+            4.修复个人中心优惠券数量不显示问题
           </div>
           <div class="text item">
-            5.微信公众号服务配置重构
+            5.模板消息推送增加小程序判断(后期会增加小程序消息)
           </div>
           <div class="text item">
-            6.修复后台配置公众号,API端必须要重启才能生效的问题#I17YFZ
+            <span style="font-weight: bolder">（2020-01-31）yshop1.9.2版本 发布更新如下：</span>
+          </div>
+          <div class="text item">
+            1.修复素材库无法分页的问题#I18KJN
+          </div>
+          <div class="text item">
+            2.修复订单退款问题#I18GG6
+          </div>
+          <div class="text item">
+            3.修复分类问题#I17UEI
+          </div>
+          <div class="text item">
+            4.修复后台添加角色的问题#I18NCW
+          </div>
+          <div class="text item">
+            5.修复H5登陆提示信息不一致#I18GZW
           </div>
         </el-card>
       </div>
diff --git a/src/views/shop/user/index.vue b/src/views/shop/user/index.vue
index 9e375f9..ab8808b 100644
--- a/src/views/shop/user/index.vue
+++ b/src/views/shop/user/index.vue
@@ -7,6 +7,14 @@
       <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
         <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
       </el-select>
+      <el-select v-model="userType" clearable placeholder="用户来源" class="filter-item" style="width: 130px">
+        <el-option
+          v-for="item in statusOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
     </div>
@@ -39,6 +47,15 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="用户来源" align="center">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.userType == 'wechat'">公众号</el-tag>
+            <el-tag v-else-if="scope.row.userType == 'routine'" >小程序</el-tag>
+            <el-tag v-else >H5</el-tag>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="spreadUid" label="推荐人" />
       <el-table-column prop="payCount" label="购买次数" />
       <el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="185" align="center" fixed="right">
@@ -105,10 +122,16 @@ export default {
   data() {
     return {
       delLoading: false,
+      userType: '',
       queryTypeOptions: [
         { key: 'nickname', display_name: '用户昵称' },
         { key: 'phone', display_name: '手机号码' }
-      ]
+      ],
+      statusOptions: [
+      { value: 'routine', label: '小程序' },
+      { value: 'wechat', label: '公众号' },
+      { value: 'H5', label: 'H5' }
+    ]
     }
   },
   created() {
@@ -142,7 +165,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxUser'
       const sort = 'uid,desc'
-      this.params = { page: this.page, size: this.size, sort: sort }
+      this.params = { page: this.page, size: this.size, sort: sort, userType: this.userType  }
       const query = this.query
       const type = query.type
       const value = query.value