Browse Source

静态页面

xcx 4 years ago
parent
commit
aca05958f7

+ 6
- 6
config/index.js View File

@@ -11,17 +11,17 @@ module.exports = {
11 11
     assetsSubDirectory: 'static',
12 12
     assetsPublicPath: '/',
13 13
     proxyTable: {
14
-      // '/api': {
15
-      //   target: 'http://123.57.65.31:9004',
16
-      //   changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
17
-      //   pathRewrite: { '^/api': '/api' }
18
-      // }
19 14
       '/api': {
20
-        target: 'https://app.xnsport.cn',
15
+        target: 'http://123.57.65.31:9004',
21 16
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
22 17
         pathRewrite: { '^/api': '/api' }
23 18
       }
24 19
       // '/api': {
20
+      //   target: 'https://app.xnsport.cn',
21
+      //   changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
22
+      //   pathRewrite: { '^/api': '/api' }
23
+      // }
24
+      // '/api': {
25 25
       //   target: 'http://114.67.101.226:8080',
26 26
       //   changeOrigin: false, // 如果接口跨域,需要进行这个参数配置
27 27
       //   pathRewrite: { '^/api': '' }

+ 5
- 5
src/pages/WoDe/CaiZhongSheZhi/index.vue View File

@@ -15,7 +15,7 @@
15 15
               </div>
16 16
             </div>
17 17
             <div class="Switch">
18
-              <van-switch v-model="item.status" active-color="#07c160" inactive-color="#D91D36" size="0.13rem" />
18
+              <van-switch v-model="item.isOpen" active-color="#07c160" inactive-color="#D91D36" size="0.13rem" />
19 19
             </div>
20 20
             <a class="Layer" @click="TriggerItemStatus(item, index)"></a>
21 21
           </li>
@@ -66,10 +66,10 @@ export default {
66 66
       'EditCurrentLotteryTypeList'
67 67
     ]),
68 68
     Init () { // 初始化
69
-      this.GetCurrentLotteryTypeList({ queryData: { shopId: this.CurrentShopInfo.shopId, pageNum: 1, pageSize: 15 } }).then(() => {
69
+      this.GetCurrentLotteryTypeList({ queryData: { shopId: this.CurrentShopInfo.shopId, pageNum: 1, pageSize: 15, all: true } }).then(() => {
70 70
         this.PageList = []
71 71
         this.CurrentLotteryTypeList.map((item) => {
72
-          this.PageList.push({ ...item, status: !!item.status })
72
+          this.PageList.push({ ...item, isOpen: !!item.isOpen })
73 73
         })
74 74
       })
75 75
     },
@@ -78,9 +78,9 @@ export default {
78 78
       this.DataLock = true
79 79
       this.SetShopLotteryState({
80 80
         urlData: { shopId: this.CurrentShopInfo.shopId, lotteryId: item.lotteryId },
81
-        data: { lotteryId: item.lotteryId, status: item.status ? 0 : 1, shopId: this.CurrentShopInfo.shopId }
81
+        data: { lotteryId: item.lotteryId, isOpen: !item.isOpen, shopId: this.CurrentShopInfo.shopId }
82 82
       }).then(() => {
83
-        this.PageList[index].status = !item.status
83
+        this.PageList[index].isOpen = !item.isOpen
84 84
         this.DataLock = false
85 85
       }).catch(() => {
86 86
         this.DataLock = false

+ 19
- 8
src/pages/WoDe/DianPuRenZheng/index.vue View File

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div class="Page">
3
-    <MainPageContainer @UserInfoChange="UserInfoChange" @ShopInfoChange="ShopInfoChange" :ShowMainHeader="true" :MainHeaderTitle="`店铺认证`" :ShowMainHeaderBack="true" :ShowMainHeaderMore="true" :MainHeaderMoreIcon="`iconbaocun`" :MainHeaderMoreText="`保存`" :MainHeaderMoreClick="SaveForm">
3
+    <MainPageContainer @ShopInfoChange="ShopInfoChange" :ShowMainHeader="true" :MainHeaderTitle="`店铺认证`" :ShowMainHeaderBack="true" :ShowMainHeaderMore="true" :MainHeaderMoreIcon="`iconbaocun`" :MainHeaderMoreText="`保存`" :MainHeaderMoreClick="SaveForm">
4 4
       <div class="Container">
5 5
         <div class="Content">
6 6
 
@@ -92,7 +92,7 @@
92 92
                 </div>
93 93
               </div>
94 94
             </div>
95
-            <!-- <div class="Line flex-h">
95
+            <div class="Line flex-h">
96 96
               <span>营业时间</span>
97 97
               <div class="flex-item" @click="ShowTimeStartSelect = true">
98 98
                 <div>
@@ -106,7 +106,7 @@
106 106
                 </div>
107 107
               </div>
108 108
               <i class="iconfont iconjiantouright"></i>
109
-            </div> -->
109
+            </div>
110 110
             <router-link tag="div" :to="{ name: 'ZhiFuBaoRenZheng' }" class="Line flex-h">
111 111
               <span>收款管理</span>
112 112
               <div class="flex-item"></div>
@@ -180,6 +180,9 @@ export default {
180 180
     'van-datetime-picker': DatetimePicker
181 181
   },
182 182
   created () {
183
+    if (this.CurrentShopInfo !== null) {
184
+      this.ShopInfoChange()
185
+    }
183 186
   },
184 187
   mounted () {
185 188
     this.$nextTick(() => {
@@ -198,10 +201,16 @@ export default {
198 201
       this.ShopName = this.CurrentShopInfo.name
199 202
       this.ZZImg = this.CurrentShopInfo.businessLicense
200 203
       this.AddressDetail = this.CurrentShopInfo.address
201
-    },
202
-    UserInfoChange () {
203
-      this.RealName = this.UserInfo.name
204
-      this.Phone = this.UserInfo.phone
204
+      this.City = this.CurrentShopInfo.cityId
205
+      this.Province = this.CurrentShopInfo.provinceName
206
+      this.SfzzmImg = this.CurrentShopInfo.shopkeeper.frontIdCard
207
+      this.SfzfmImg = this.CurrentShopInfo.shopkeeper.backIdCard
208
+      this.RealName = this.CurrentShopInfo.shopkeeper.name
209
+      this.Phone = this.CurrentShopInfo.shopkeeper.phone
210
+      this.Lat = this.CurrentShopInfo.lat
211
+      this.Lng = this.CurrentShopInfo.lng
212
+      this.StartTime = this.CurrentShopInfo.openTime
213
+      this.EndTime = this.CurrentShopInfo.closeTime
205 214
     },
206 215
     CheckForm () { // 校验表单
207 216
       if (this.ShopName === '') {
@@ -234,7 +243,9 @@ export default {
234 243
           lat: this.Lat,
235 244
           lng: this.Lng,
236 245
           name: this.ShopName,
237
-          provinceId: this.Province
246
+          provinceId: this.Province,
247
+          openTime: this.StartTime,
248
+          closeTime: this.EndTime
238 249
         },
239 250
         shopkeeper: {
240 251
           avatar: this.UserInfo.avatar,

+ 8
- 2
src/pages/WoDe/ShouYe/index.vue View File

@@ -23,8 +23,8 @@
23 23
                 <em>6.20</em>
24 24
                 <i class="iconfont iconjiantouright"></i>
25 25
               </div>
26
-              <div class="Desc">
27
-                <span>店铺营业时间为:9:00~21:00</span>
26
+              <div class="Desc" v-if="CurrentShopInfo !== null">
27
+                <span>店铺营业时间为:{{CurrentShopInfo.openTime}}~{{CurrentShopInfo.closeTime}}</span>
28 28
                 <span>休息时间不显示在购票选店列表内</span>
29 29
               </div>
30 30
             </div>
@@ -48,6 +48,8 @@
48 48
 
49 49
 <script>
50 50
 import MainPageContainer from '../../../components/common/MainPageContainer'
51
+import { createNamespacedHelpers } from 'vuex'
52
+const { mapState: mapUserState } = createNamespacedHelpers('user')
51 53
 export default {
52 54
   name: 'index',
53 55
   data () {
@@ -62,6 +64,10 @@ export default {
62 64
     }
63 65
   },
64 66
   computed: {
67
+    ...mapUserState({
68
+      CurrentShopInfo: x => x.CurrentShopInfo,
69
+      UserInfo: x => x.UserInfo
70
+    })
65 71
   },
66 72
   components: {
67 73
     MainPageContainer

+ 1
- 1
src/store/user/index.js View File

@@ -69,7 +69,7 @@ export default {
69 69
       state.CurrentShopAllCustomer = []
70 70
     },
71 71
     UpdateCurrentLotteryTypeList (state, data) { // 更新当前店铺开通彩种
72
-      state.CurrentLotteryTypeList = data.records || []
72
+      state.CurrentLotteryTypeList = data || []
73 73
     },
74 74
     EmptyCurrentLotteryTypeList (state) { // 清空当前店铺开通彩种
75 75
       state.CurrentLotteryTypeList = []