From 509669fe9fc6c5fd419fe03e9912ba80020b7961 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Thu, 9 Jan 2020 16:11:33 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.7.2=E5=8F=91=E5=B8=83:=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98=E4=B8=8E=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95,=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2,?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7swagger-bootstrap,swaager=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=BF=81=E7=A7=BB=E5=88=B0common(=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E6=B3=A8=E8=A7=A3=E5=86=B2=E7=AA=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue                  | 15 +++++++++++++++
 src/views/shop/set/form.vue         | 12 ++++++++----
 src/views/shop/set/index.vue        |  2 ++
 src/views/shop/set/menu.vue         |  2 ++
 src/views/shop/set/menuform.vue     | 12 ++++++++----
 src/views/shop/set/roll.vue         |  2 ++
 src/views/shop/set/rollform.vue     | 10 +++++++---
 src/views/shop/set/usermenu.vue     |  2 ++
 src/views/shop/set/usermenuform.vue | 10 +++++++---
 9 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 1b662ad..33a9239 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -52,6 +52,21 @@ export default {
     ...mapGetters([
       'roles'
     ])
+  },
+
+  created() {
+    this.open()
+  },
+
+  methods: {
+    open() {
+      this.$notify({
+        title: '公众号演示',
+        dangerouslyUseHTMLString: true,
+        message: '<img src="https://image.dayouqiantu.cn/qrcode_for_gh_95df5a2881cc_258.jpg">',
+        duration: 0
+      });
+    }
   }
 }
 </script>
diff --git a/src/views/shop/set/form.vue b/src/views/shop/set/form.vue
index cf77159..ce4e22e 100644
--- a/src/views/shop/set/form.vue
+++ b/src/views/shop/set/form.vue
@@ -1,14 +1,17 @@
 <template>
   <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 ref="form" :model="form" :rules="rules" size="small" label-width="120px">
       <el-form-item label="标题">
-        <el-input v-model="form.name" style="width: 370px;" />
+        <el-input v-model="form.name" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="跳转url">
-        <el-input v-model="form.url" style="width: 370px;" />
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="小程序跳转page">
+        <el-input v-model="form.wxapp_url" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="图片(750*375)">
-        <pic-upload v-model="form.pic" style="width: 500px;" />
+        <pic-upload v-model="form.pic"  />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -38,6 +41,7 @@ export default {
         groupName: 'routine_home_banner',
         name: '',
         url: '',
+        wxapp_url: '',
         pic: '',
         sort: '',
         status: ''
diff --git a/src/views/shop/set/index.vue b/src/views/shop/set/index.vue
index fbcb19c..46c239f 100644
--- a/src/views/shop/set/index.vue
+++ b/src/views/shop/set/index.vue
@@ -21,6 +21,7 @@
       <el-table-column prop="id" label="ID" />
       <el-table-column prop="map.name" label="标题" />
       <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.wxapp_url" label="小程序跳转page" />
       <el-table-column ref="table" label="图片">
         <template slot-scope="scope">
           <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
@@ -113,6 +114,7 @@ export default {
         groupName: data.groupName,
         name: data.map.name,
         url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
         pic: data.map.pic
       }
       _this.dialog = true
diff --git a/src/views/shop/set/menu.vue b/src/views/shop/set/menu.vue
index 5d5b691..3b0abf9 100644
--- a/src/views/shop/set/menu.vue
+++ b/src/views/shop/set/menu.vue
@@ -21,6 +21,7 @@
       <el-table-column prop="id" label="ID" />
       <el-table-column prop="map.name" label="分类名称" />
       <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.wxapp_url" label="小程序跳转page" />
       <el-table-column ref="table" label="分类图标">
         <template slot-scope="scope">
           <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
@@ -113,6 +114,7 @@ export default {
         groupName: data.groupName,
         name: data.map.name,
         url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
         pic: data.map.pic
       }
       _this.dialog = true
diff --git a/src/views/shop/set/menuform.vue b/src/views/shop/set/menuform.vue
index 54ed033..254a3de 100644
--- a/src/views/shop/set/menuform.vue
+++ b/src/views/shop/set/menuform.vue
@@ -1,14 +1,17 @@
 <template>
   <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 ref="form" :model="form" :rules="rules" size="small" label-width="120px">
       <el-form-item label="分类名称">
-        <el-input v-model="form.name" style="width: 370px;" />
+        <el-input v-model="form.name" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="跳转url">
-        <el-input v-model="form.url" style="width: 370px;" />
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="小程序跳转page">
+        <el-input v-model="form.wxapp_url" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="分类图标(90*90)">
-        <pic-upload v-model="form.pic" style="width: 500px;" />
+        <pic-upload v-model="form.pic"  />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -38,6 +41,7 @@ export default {
         groupName: 'routine_home_menus',
         name: '',
         url: '',
+        wxapp_url: '',
         pic: '',
         sort: '',
         status: ''
diff --git a/src/views/shop/set/roll.vue b/src/views/shop/set/roll.vue
index 63a239a..8de8c83 100644
--- a/src/views/shop/set/roll.vue
+++ b/src/views/shop/set/roll.vue
@@ -21,6 +21,7 @@
       <el-table-column prop="id" label="ID" />
       <el-table-column prop="map.info" label="滚动文字" />
       <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.wxapp_url" label="小程序跳转page" />
       <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <el-button v-permission="['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
@@ -109,6 +110,7 @@ export default {
         title: data.map.title,
         info: data.map.info,
         url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
         pic: data.map.pic
       }
       _this.dialog = true
diff --git a/src/views/shop/set/rollform.vue b/src/views/shop/set/rollform.vue
index 5ac970e..f906649 100644
--- a/src/views/shop/set/rollform.vue
+++ b/src/views/shop/set/rollform.vue
@@ -1,11 +1,14 @@
 <template>
   <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="100px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
       <el-form-item label="滚动文字">
-        <el-input v-model="form.info" style="width: 370px;" />
+        <el-input v-model="form.info" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="跳转url">
-        <el-input v-model="form.url" style="width: 370px;" />
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="小程序跳转page">
+        <el-input v-model="form.wxapp_url" style="width: 300px;" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -34,6 +37,7 @@ export default {
         id: '',
         groupName: 'routine_home_roll_news',
         info: '',
+        wxapp_url: '',
         url: ''
       },
       rules: {
diff --git a/src/views/shop/set/usermenu.vue b/src/views/shop/set/usermenu.vue
index c81eadc..84b4674 100644
--- a/src/views/shop/set/usermenu.vue
+++ b/src/views/shop/set/usermenu.vue
@@ -21,6 +21,7 @@
       <el-table-column prop="id" label="ID" />
       <el-table-column prop="map.name" label="菜单名" />
       <el-table-column prop="map.url" label="链接url" />
+      <el-table-column prop="map.wxapp_url" label="小程序跳转page" />
       <el-table-column ref="table" label="图标">
         <template slot-scope="scope">
           <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
@@ -113,6 +114,7 @@ export default {
         groupName: data.groupName,
         name: data.map.name,
         url: data.map.url,
+        wxapp_url: data.map.wxapp_url,
         pic: data.map.pic
       }
       _this.dialog = true
diff --git a/src/views/shop/set/usermenuform.vue b/src/views/shop/set/usermenuform.vue
index f255b75..e390a2a 100644
--- a/src/views/shop/set/usermenuform.vue
+++ b/src/views/shop/set/usermenuform.vue
@@ -1,11 +1,14 @@
 <template>
   <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 ref="form" :model="form" :rules="rules" size="small" label-width="120px">
       <el-form-item label="菜单名">
-        <el-input v-model="form.name" style="width: 370px;" />
+        <el-input v-model="form.name" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="跳转url">
-        <el-input v-model="form.url" style="width: 370px;" />
+        <el-input v-model="form.url" style="width: 300px;" />
+      </el-form-item>
+      <el-form-item label="小程序跳转page">
+        <el-input v-model="form.wxapp_url" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="图标(52*52)">
         <pic-upload v-model="form.pic" style="width: 500px;" />
@@ -38,6 +41,7 @@ export default {
         groupName: 'routine_my_menus',
         name: '',
         url: '',
+        wxapp_url: '',
         pic: '',
         sort: '',
         status: ''