yuantianjiao 6 years ago
parent
commit
12c4bf6ff2

+ 2
- 2
src/components/discounts/discounts.vue View File

18
       </div>
18
       </div>
19
     </div>
19
     </div>
20
     <div class="useType">
20
     <div class="useType">
21
-      <img :src="used" alt="已使用" v-if="data.useType == '已使用'" width="100%" height="100%">
22
-      <img :src="failure" alt="已失效" v-if="data.useType == '已失效'" width="100%" height="100%">
21
+      <img :src="used" v-if="data.useType == '已使用'" width="100%" height="100%">
22
+      <img :src="failure" v-if="data.useType == '已失效'" width="100%" height="100%">
23
     </div>
23
     </div>
24
   </div>
24
   </div>
25
 </template>
25
 </template>

+ 1
- 1
src/pages/sales/customerSearch/index.vue View File

1
 <template>
1
 <template>
2
   <div class="mainPage flex-v">
2
   <div class="mainPage flex-v">
3
     <div class="top">
3
     <div class="top">
4
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''"></topCaseInfo>
4
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''"></topCaseInfo>
5
     </div>
5
     </div>
6
     <div class="content flex-item">
6
     <div class="content flex-item">
7
       <div>
7
       <div>

+ 1
- 1
src/pages/sales/getRecord/index.vue View File

1
 <template>
1
 <template>
2
   <div class="mainPage flex-v">
2
   <div class="mainPage flex-v">
3
     <div class="top">
3
     <div class="top">
4
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showSelect = true"></topCaseInfo>
4
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showSelect = true"></topCaseInfo>
5
     </div>
5
     </div>
6
     <div class="info">
6
     <div class="info">
7
       <span><em>姓名:</em>{{user.name}}</span>
7
       <span><em>姓名:</em>{{user.name}}</span>

+ 1
- 1
src/pages/sales/salesGiveOutDetail/index.vue View File

1
 <template>
1
 <template>
2
   <div class="mainPage flex-v">
2
   <div class="mainPage flex-v">
3
     <div class="top">
3
     <div class="top">
4
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
4
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showVanPicker"></topCaseInfo>
5
     </div>
5
     </div>
6
     <div class="flex-item flex-v body" v-if="data.allCard">
6
     <div class="flex-item flex-v body" v-if="data.allCard">
7
       <span>销售姓名:<em>{{data.RealName}}</em></span>
7
       <span>销售姓名:<em>{{data.RealName}}</em></span>

+ 1
- 1
src/pages/sales/salesRecord/index.vue View File

1
 <template>
1
 <template>
2
   <div class="mainPage flex-v">
2
   <div class="mainPage flex-v">
3
     <div class="top">
3
     <div class="top">
4
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
4
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showVanPicker"></topCaseInfo>
5
     </div>
5
     </div>
6
     <div class="flex-item body">
6
     <div class="flex-item body">
7
       <div>
7
       <div>

+ 6
- 6
src/pages/user/App.vue View File

34
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
34
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
35
       this.showPage = true
35
       this.showPage = true
36
     })
36
     })
37
-    wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
38
-      title: '城的空间',
39
-      desc: '城的空间',
40
-      link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
41
-      thu_image: `${window.location.origin}${window.location.pathname}${logo}`
42
-    })
37
+    // wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
38
+    //   title: '城的空间',
39
+    //   desc: '城的空间',
40
+    //   link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
41
+    //   thu_image: `${window.location.origin}${window.location.pathname}${logo}`
42
+    // })
43
   },
43
   },
44
   methods: {
44
   methods: {
45
     ...actions(['getUserInfo'])
45
     ...actions(['getUserInfo'])

+ 1
- 1
src/pages/user/cardDetail/index.vue View File

14
       </div>
14
       </div>
15
       <div class="rule">
15
       <div class="rule">
16
         <div>使用规则</div>
16
         <div>使用规则</div>
17
-        <div>{{info.Share.CardUseInstruction}}</div>
17
+        <pre style="white-space: pre;">{{info.Share.CardUseInstruction}}</pre>
18
       </div>
18
       </div>
19
       <div class="line">
19
       <div class="line">
20
         <img :src="Artboard" alt="" width="100%">
20
         <img :src="Artboard" alt="" width="100%">

+ 3
- 2
src/pages/user/couponsDetail/index.vue View File

13
       </div>
13
       </div>
14
       <div class="rule">
14
       <div class="rule">
15
         <div>使用规则</div>
15
         <div>使用规则</div>
16
-        <div>1. 此卡不可兑换现金,不可与其他优惠活动同时使用。 </div>
16
+        <pre style="white-space: pre;">{{info.Share.UseInstruction}}</pre>
17
+        <!-- <div>1. 此卡不可兑换现金,不可与其他优惠活动同时使用。 </div>
17
         <div>2. 此卡不可多人使用,一人记一次。 </div>
18
         <div>2. 此卡不可多人使用,一人记一次。 </div>
18
         <div>3. 非会员可凭此卡享受对应课程。 </div>
19
         <div>3. 非会员可凭此卡享受对应课程。 </div>
19
-        <div>4. 截止日期至{{toolClass.dateFormat(info.EndDate)}}。 </div>
20
+        <div>4. 截止日期至{{toolClass.dateFormat(info.EndDate)}}。 </div> -->
20
       </div>
21
       </div>
21
       <div class="line">
22
       <div class="line">
22
         <img :src="Artboard" alt="" width="100%">
23
         <img :src="Artboard" alt="" width="100%">

+ 1
- 1
src/pages/user/mainPage/coffeeIndex/index.vue View File

1
 <template>
1
 <template>
2
   <div class="mainPage flex-v">
2
   <div class="mainPage flex-v">
3
     <div class="top">
3
     <div class="top">
4
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.Name : ''" @selectCase="showVanPicker"></topCaseInfo>
4
+      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer !== undefined ? userInfo.customer.RealName : ''" @selectCase="showVanPicker"></topCaseInfo>
5
     </div>
5
     </div>
6
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
6
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== ''">
7
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '4'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
7
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" v-if="userInfo.customer.UserTypeId !== 'manager' || item.id !== '4'" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>

+ 1
- 1
src/pages/user/mainPage/indexPage/index.vue View File

152
       if (item.ForwardType === 'url') {
152
       if (item.ForwardType === 'url') {
153
         window.location.href = item.ForwardUrl
153
         window.location.href = item.ForwardUrl
154
       } else if (item.ForwardType === 'course') {
154
       } else if (item.ForwardType === 'course') {
155
-        this.$router.push({ name: '', query: { id: item.ForwardResourceId } }) // 此处去课程详情
155
+        this.$router.push({ name: 'majorProjectsDetail', query: { id: item.ForwardResourceId } }) // 此处去课程详情
156
       } else {
156
       } else {
157
         window.location.href = item.InfoUrl
157
         window.location.href = item.InfoUrl
158
       }
158
       }

+ 19
- 6
src/pages/user/placeOrder/index.vue View File

70
     </div>
70
     </div>
71
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
71
     <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
72
     <calcMenu :show="showCalcMenu" :totalNum="sumNum + caseTotal.total" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
72
     <calcMenu :show="showCalcMenu" :totalNum="sumNum + caseTotal.total" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
73
+    <div class="successPopup" v-if="showSuccessPopup">
74
+      <div>
75
+        <i class="iconfont icon-gou"></i>
76
+        <div class="text">出单成功</div>
77
+        <div class="back" @click="popBack">返回等待</div>
78
+      </div>
79
+    </div>
73
   </div>
80
   </div>
74
 </template>
81
 </template>
75
 
82
 
136
         freeModeMomentumVelocityRatio: 2,
143
         freeModeMomentumVelocityRatio: 2,
137
       },
144
       },
138
       selGoods: [],
145
       selGoods: [],
146
+      showSuccessPopup: false
139
     }
147
     }
140
   },
148
   },
141
   computed: {
149
   computed: {
295
         detail: JSON.stringify(this.postData.detail),
303
         detail: JSON.stringify(this.postData.detail),
296
         coupon: JSON.stringify(this.postData.coupon)
304
         coupon: JSON.stringify(this.postData.coupon)
297
       }).then((res) => {
305
       }).then((res) => {
298
-        this.$dialog.alert({
299
-          message: '下单成功!',
300
-          confirmButtonText: '返回等待'
301
-        }).then(() => {
302
-          this.$router.push({ name: 'orderList' })
303
-        })
306
+        this.showSuccessPopup = true
307
+        // this.$dialog.alert({
308
+        //   message: '下单成功!',
309
+        //   confirmButtonText: '返回等待'
310
+        // }).then(() => {
311
+
312
+        // })
304
       })
313
       })
305
     },
314
     },
315
+    popBack () {
316
+      this.showSuccessPopup = false
317
+      this.$router.push({ name: 'orderList' })
318
+    },
306
     closeCalcMenu () { // 关闭已选菜单
319
     closeCalcMenu () { // 关闭已选菜单
307
       this.showCalcMenu = false
320
       this.showCalcMenu = false
308
     },
321
     },

+ 39
- 0
src/pages/user/placeOrder/page.scss View File

238
       }
238
       }
239
     }
239
     }
240
   }
240
   }
241
+  .successPopup{
242
+    width: 100%;
243
+    height: 100%;
244
+    position: fixed;
245
+    top: 0;
246
+    left: 0;
247
+    z-index: 999;
248
+    background: rgba(0, 0, 0, .05);
249
+    >div{
250
+      position: absolute;
251
+      top: 50%;
252
+      left: 50%;
253
+      transform: translate(-50%,-50%);
254
+      width: 2.6rem;
255
+      height: 1.7rem;
256
+      background:rgba(255,255,255,1);
257
+      box-shadow:0px 2px 4px 0px rgba(194,194,194,0.5);
258
+      border-radius:4px;
259
+      display: flex;
260
+      flex-flow: column nowrap;
261
+      justify-content: center;
262
+      align-items: center;
263
+      padding: .2rem;
264
+      i{
265
+        color: #fc6243;
266
+        font-size: .36rem;
267
+        margin-bottom: .2rem;
268
+      }
269
+      .text{
270
+        font-size: .16rem;
271
+        margin-bottom: .2rem;
272
+      }
273
+      .back{
274
+        padding: .07rem .3rem;
275
+        border: 1px solid black;
276
+        border-radius: 4px;
277
+      }
278
+    }
279
+  }
241
 }
280
 }

+ 19
- 6
src/pages/user/placeOrderDetail/index.vue View File

65
         <a @click="sureSelectCoupon">确定</a>
65
         <a @click="sureSelectCoupon">确定</a>
66
       </div>
66
       </div>
67
     </div>
67
     </div>
68
+    <div class="successPopup" v-if="showSuccessPopup">
69
+      <div>
70
+        <i class="iconfont icon-gou"></i>
71
+        <div class="text">出单成功</div>
72
+        <div class="back" @click="popBack>返回等待</div>
73
+      </div>
74
+    </div>
68
   </div>
75
   </div>
69
 </template>
76
 </template>
70
 
77
 
105
         value: '优惠券3',
112
         value: '优惠券3',
106
         id: '3',
113
         id: '3',
107
       }],
114
       }],
108
-      orderInfo: JSON.parse(_self.$route.query.info) || []
115
+      orderInfo: JSON.parse(_self.$route.query.info) || [],
116
+      showSuccessPopup: false
109
     }
117
     }
110
   },
118
   },
111
   components: {
119
   components: {
225
         detail: JSON.stringify(this.postData.detail),
233
         detail: JSON.stringify(this.postData.detail),
226
         customercouponid: this.postData.customercouponid
234
         customercouponid: this.postData.customercouponid
227
       }).then((res) => {
235
       }).then((res) => {
228
-        this.$dialog.alert({
229
-          message: '下单成功!'
230
-        }).then(() => {
231
-          window.history.go(-2)
232
-        })
236
+        this.showSuccessPopup = true
237
+        // this.$dialog.alert({
238
+        //   message: '下单成功!'
239
+        // }).then(() => {
240
+        //   window.history.go(-2)
241
+        // })
233
       })
242
       })
234
     },
243
     },
244
+    popBack () {
245
+      this.showSuccessPopup = false
246
+      window.history.go(-2)
247
+    },
235
     cancel () {
248
     cancel () {
236
       window.history.go(-1)
249
       window.history.go(-1)
237
     },
250
     },

+ 39
- 0
src/pages/user/placeOrderDetail/page.scss View File

299
     //   }
299
     //   }
300
     // }
300
     // }
301
   }
301
   }
302
+  .successPopup{
303
+    width: 100%;
304
+    height: 100%;
305
+    position: fixed;
306
+    top: 0;
307
+    left: 0;
308
+    z-index: 999;
309
+    background: rgba(0, 0, 0, .05);
310
+    >div{
311
+      position: absolute;
312
+      top: 50%;
313
+      left: 50%;
314
+      transform: translate(-50%,-50%);
315
+      width: 2.6rem;
316
+      height: 1.7rem;
317
+      background:rgba(255,255,255,1);
318
+      box-shadow:0px 2px 4px 0px rgba(194,194,194,0.5);
319
+      border-radius:4px;
320
+      display: flex;
321
+      flex-flow: column nowrap;
322
+      justify-content: center;
323
+      align-items: center;
324
+      padding: .2rem;
325
+      i{
326
+        color: #fc6243;
327
+        font-size: .36rem;
328
+        margin-bottom: .2rem;
329
+      }
330
+      .text{
331
+        font-size: .16rem;
332
+        margin-bottom: .2rem;
333
+      }
334
+      .back{
335
+        padding: .07rem .3rem;
336
+        border: 1px solid black;
337
+        border-radius: 4px;
338
+      }
339
+    }
340
+  }
302
 }
341
 }