SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

bug fix

许成详 6 years ago
parent
62dae9e99b
commit
6125039721
7 changed files with 33 additions and 26 deletions
Split View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 1
    1
      src/pages/system/cardAndCouponManager/cardManager/index.vue
  3. 1
    1
      src/pages/system/cardAndCouponManager/couponManager/index.vue
  4. 24
    17
      src/pages/system/cardAndCouponManager/vipManager/activateVip.vue
  5. 1
    1
      src/pages/system/cardAndCouponManager/vipManager/edit.vue
  6. 4
    4
      src/pages/system/marketingActivities/snapUpList/edit.vue
  7. 1
    1
      src/pages/system/marketingActivities/snapUpList/index.vue

+ 1
- 1
dist/index.html View File 

@@ -1 +1 @@
1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.936d7c7b58d7626368266ed1f744294d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.71fd787520fc12b02935.js></script><script type=text/javascript src=./static/js/app.0f09cfbfb009decb490c.js></script></body></html>
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.46d158869775a9a06a72a840092ae813.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.71fd787520fc12b02935.js></script><script type=text/javascript src=./static/js/app.0f75a2871724b9967071.js></script></body></html>

+ 1
- 1
src/pages/system/cardAndCouponManager/cardManager/index.vue View File 

@@ -92,7 +92,7 @@
92 92 
               size="mini"
93 93 
               type="success"
94 94 
               v-if="scope.row.SendType === 'channel'"
95 
-              v-clipboard:copy="clientUrl + 'wechat/user.html#/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
95 
+              v-clipboard:copy="clientUrl + '/wechat/user.html#/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
96 96 
               v-clipboard:success="onCopy"
97 97 
               v-clipboard:error="onError"
98 98 
               >点击复制链接</el-button>

+ 1
- 1
src/pages/system/cardAndCouponManager/couponManager/index.vue View File 

@@ -87,7 +87,7 @@
87 87 
               size="mini"
88 88 
               type="success"
89 89 
               v-if="scope.row.SendType === 'channel'"
90 
-              v-clipboard:copy="clientUrl + 'wechat/user.html#/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
90 
+              v-clipboard:copy="clientUrl + '/wechat/user.html#/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
91 91 
               v-clipboard:success="onCopy"
92 92 
               v-clipboard:error="onError"
93 93 
               >点击复制链接</el-button>

+ 24
- 17
src/pages/system/cardAndCouponManager/vipManager/activateVip.vue View File 

@@ -81,7 +81,7 @@
81 81 
       </div>
82 82 
       <span slot="footer" class="dialog-footer">
83 83 
         <el-button @click="centerDialogVisible = false">取 消</el-button>
84 
-        <el-button type="primary" @click="vipCharge">激 活</el-button>
84 
+        <el-button type="primary" @click="vipCharger">激 活</el-button>
85 85 
       </span>
86 86 
     </el-dialog>
87 87 
   </div>

@@ -97,6 +97,7 @@ export default {
97 97 
   name: '',
98 98 
   data () {
99 99 
     return {
100 
+      ajaxOff: true,
100 101 
       centerDialogVisible: false,
101 102 
       CardNo: '',
102 103 
       salesPhone: '',

@@ -194,7 +195,7 @@ export default {
194 195 
         })
195 196 
       }
196 197 
     },
197 
-    vipCharge () {
198 
+    vipCharger () {
198 199 
       if (this.vip.VipCardChildCode === '') {
199 200 
         this.$message({
200 201 
           type: 'error',

@@ -209,22 +210,28 @@ export default {
209 210 
         })
210 211 
         return
211 212 
       }
212 
-      var that = this
213 
-      this.VipCharge({
214 
-        code: this.vip.VipCardChildCode,
215 
-        tel: this.customer.Phone,
216 
-        salesid: this.sales.UserId || '',
217 
-        salesname: this.sales.RealName || '',
218 
-      }).then(() => {
219 
-        this.$message({
220 
-          type: 'success',
221 
-          message: '激活成功！',
213 
+      if (this.ajaxOff) {
214 
+        this.ajaxOff = false
215 
+        this.VipCharge({
216 
+          code: this.vip.VipCardChildCode,
217 
+          tel: this.customer.Phone,
218 
+          salesid: this.sales.UserId || '',
219 
+          salesname: this.sales.RealName || '',
220 
+        }).then(() => {
221 
+          this.ajaxOff = true
222 
+          this.$message({
223 
+            type: 'success',
224 
+            message: '激活成功！',
225 
+          })
226 
+          // setTimeout(() => {
227 
+          //   that.setNull()
228 
+          //   that.centerDialogVisible = false
229 
+          // }, 1000)
230 
+          this.$router.push({name: 'vipList'})
231 
+        }).catch(() => {
232 
+          this.ajaxOff = true
222 233 
         })
223 
-        setTimeout(() => {
224 
-          that.setNull()
225 
-          that.centerDialogVisible = false
226 
-        }, 1000)
227 
-      })
234 
+      }
228 235 
     },
229 236 
   },
230 237 
   mounted () { }

+ 1
- 1
src/pages/system/cardAndCouponManager/vipManager/edit.vue View File 

@@ -53,7 +53,7 @@
53 53 
               </el-date-picker>
54 54 
               <span style="line-height:40px;">至</span>
55 55 
               <el-date-picker
56 
-                value-format="yyyy-MM-ddT00:00:00+08:00"
56 
+                value-format="yyyy-MM-ddT23:59:59+08:00"
57 57 
                 v-model="postData.EndDate"
58 58 
                 type="date"
59 59 
                 placeholder="选择截止日期">

+ 4
- 4
src/pages/system/marketingActivities/snapUpList/edit.vue View File 

@@ -67,17 +67,17 @@
67 67 
                   <div>
68 68 
                     <el-date-picker
69 69 
                       :disabled="editOff || isread"
70 
-                      value-format="yyyy-MM-ddT00:00:00+08:00"
70 
+                      value-format="yyyy-MM-ddTHH:mm:ss+08:00"
71 71 
                       v-model="postData.StartDate"
72 
-                      type="date"
72 
+                      type="datetime"
73 73 
                       placeholder="选择开始日期">
74 74 
                     </el-date-picker>
75 75 
                     <span>至</span>
76 76 
                     <el-date-picker
77 77 
                       :disabled="editOff || isread"
78 
-                      value-format="yyyy-MM-ddT23:59:59+08:00"
78 
+                      value-format="yyyy-MM-ddTHH:mm:ss+08:00"
79 79 
                       v-model="postData.EndDate"
80 
-                      type="date"
80 
+                      type="datetime"
81 81 
                       placeholder="选择截止日期">
82 82 
                     </el-date-picker>
83 83 
                   </div>

+ 1
- 1
src/pages/system/marketingActivities/snapUpList/index.vue View File 

@@ -169,7 +169,7 @@
169 169 
             prop="VerifyStatus"
170 170 
             label="核销状态">
171 171 
             <template slot-scope="scope">
172 
-              {{scope.row.Status === 'useable' ? '未核销' : '已核销'}}
172 
+              {{scope.row.VerifyStatus === 'useable' ? '未核销' : '已核销'}}
173 173 
             </template>
174 174 
           </el-table-column>
175 175 
         </el-table>