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

xcx

许成详 6 years ago
parent
67cf2868c4
commit
67c5117531
7 changed files with 24 additions and 29 deletions
Split View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 2
    2
      src/pages/system/cardAndCouponManager/bodyBuildingCardManager/edit.vue
  3. 2
    2
      src/pages/system/cardAndCouponManager/cardManager/edit.vue
  4. 4
    4
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  5. 2
    13
      src/pages/system/courseManager/courseList/add.vue
  6. 11
    5
      src/pages/system/verificationManager/phoneVerification/verificationList/index.vue
  7. 2
    2
      src/util/api.js

+ 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><title>城的空间后台管理系统</title><link href=./static/css/app.3e4748c83fcfdc07f0dd9260d0edb217.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.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.2ee3e312f9d674e5d867.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><title>城的空间后台管理系统</title><link href=./static/css/app.e6375a30929d491dc6b534d0abbdd641.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.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.e125f0b3cf29da3fe6a6.js></script></body></html>

+ 2
- 2
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/edit.vue View File 

@@ -120,7 +120,7 @@
120 120 
             <div>
121 121 
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
122 122 
                 <el-date-picker
123 
-                  value-format="yyyy-MM-ddT00:00:00Z"
123 
+                  value-format="yyyy-MM-ddT00:00:00+08:00"
124 124 
                   :picker-options="pickerOptions"
125 125 
                   v-model="cardInfo.StartDate"
126 126 
                   type="date"

@@ -129,7 +129,7 @@
129 129 
                 </el-date-picker>
130 130 
                 <span style="line-height:40px;">至</span>
131 131 
                 <el-date-picker
132 
-                  value-format="yyyy-MM-ddT23:59:59Z"
132 
+                  value-format="yyyy-MM-ddT23:59:59+08:00"
133 133 
                   :picker-options="pickerOptions"
134 134 
                   v-model="cardInfo.EndDate"
135 135 
                   type="date"

+ 2
- 2
src/pages/system/cardAndCouponManager/cardManager/edit.vue View File 

@@ -119,7 +119,7 @@
119 119 
             <div>
120 120 
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
121 121 
                 <el-date-picker
122 
-                  value-format="yyyy-MM-ddT00:00:00Z"
122 
+                  value-format="yyyy-MM-ddT00:00:00+08:00"
123 123 
                   :disabled="isEdit"
124 124 
                   v-model="cardInfo.StartDate"
125 125 
                   :picker-options="pickerOptions"

@@ -128,7 +128,7 @@
128 128 
                 </el-date-picker>
129 129 
                 <span style="line-height:40px;">至</span>
130 130 
                 <el-date-picker
131 
-                  value-format="yyyy-MM-ddT23:59:59Z"
131 
+                  value-format="yyyy-MM-ddT23:59:59+08:00"
132 132 
                   :disabled="true"
133 133 
                   v-model="cardInfo.EndDate"
134 134 
                   type="date"

+ 4
- 4
src/pages/system/cardAndCouponManager/couponManager/edit.vue View File 

@@ -162,7 +162,7 @@
162 162 
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
163 163 
                 <el-radio v-model="postData.TimeType" label="1" :disabled="isEdit">固定时间</el-radio>
164 164 
                 <el-date-picker
165 
-                  value-format="yyyy-MM-ddT00:00:00Z"
165 
+                  value-format="yyyy-MM-ddT00:00:00+08:00"
166 166 
                   :disabled="isEdit"
167 167 
                   v-model="couponInfo.StartDate"
168 168 
                   :picker-options="pickerOptions"

@@ -171,7 +171,7 @@
171 171 
                 </el-date-picker>
172 172 
                 <span style="line-height:40px;">至</span>
173 173 
                 <el-date-picker
174 
-                  value-format="yyyy-MM-ddT23:59:59Z"
174 
+                  value-format="yyyy-MM-ddT23:59:59+08:00"
175 175 
                   :disabled="isEdit"
176 176 
                   v-model="couponInfo.EndDate"
177 177 
                   :picker-options="pickerOptions"

@@ -199,7 +199,7 @@
199 199 
           <div class="flex-item">
200 200 
             <div>
201 201 
               <el-date-picker
202 
-                value-format="yyyy-MM-ddT00:00:00Z"
202 
+                value-format="yyyy-MM-ddT00:00:00+08:00"
203 203 
                 :disabled="isEdit"
204 204 
                 v-model="couponInfo.StartDate"
205 205 
                 :picker-options="pickerOptions"

@@ -208,7 +208,7 @@
208 208 
               </el-date-picker>
209 209 
               <span style="line-height:40px;">至</span>
210 210 
               <el-date-picker
211 
-                value-format="yyyy-MM-ddT23:59:59Z"
211 
+                value-format="yyyy-MM-ddT23:59:59+08:00"
212 212 
                 :disabled="isEdit"
213 213 
                 v-model="couponInfo.EndDate"
214 214 
                 :picker-options="pickerOptions"

+ 2
- 13
src/pages/system/courseManager/courseList/add.vue View File 

@@ -118,7 +118,7 @@
118 118 
           <div class="flex-item">
119 119 
             <div>
120 120 
               <el-date-picker
121 
-                value-format="yyyy-MM-ddT00:00:00Z"
121 
+                value-format="yyyy-MM-ddT00:00:00+08:00"
122 122 
                 :picker-options="pickerOptions"
123 123 
                 v-model="detail.BeginDate"
124 124 
                 type="date"

@@ -126,23 +126,12 @@
126 126 
               </el-date-picker>
127 127 
               <span style="line-height:40px;">至</span>
128 128 
               <el-date-picker
129 
-                value-format="yyyy-MM-ddT23:59:59Z"
129 
+                value-format="yyyy-MM-ddT23:59:59+08:00"
130 130 
                 :picker-options="pickerOptions"
131 131 
                 v-model="detail.EndDate"
132 132 
                 type="date"
133 133 
                 placeholder="选择截止日期">
134 134 
               </el-date-picker>
135 
-              <!-- <el-date-picker
136 
-                v-model="courseDate"
137 
-                type="daterange"
138 
-                align="right"
139 
-                unlink-panels
140 
-                range-separator="至"
141 
-                start-placeholder="开始日期"
142 
-                end-placeholder="结束日期"
143 
-                :default-time="['00:00:00', '23:59:59']"
144 
-                :picker-options="pickerOptions">
145 
-              </el-date-picker> -->
146 135 
             </div>
147 136 
           </div>
148 137 
         </li>

+ 11
- 5
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue View File 

@@ -73,10 +73,10 @@
73 73 
             </el-table>
74 74 
             <el-pagination
75 75 
             @current-change="handleCurrentChange"
76 
-            :current-page.sync="courses.page"
77 
-            :page-size="courses.pagesize"
76 
+            :current-page.sync="page"
77 
+            :page-size="pagesize"
78 78 
             layout="prev, pager, next, jumper"
79 
-            :total="courses.pagenum">
79 
+            :total="total">
80 80 
           </el-pagination>
81 81 
         </div>
82 82 
         <span class="noData" v-else>查不到当前课程信息，请核对手机号或课程详情</span>

@@ -166,12 +166,13 @@ export default {
166 166 
       tel: '',
167 167 
       page: 1,
168 168 
       pagesize: 10,
169 
+      dialogTotal: 0,
170 
+      total: 1,
169 171 
       postData: {
170 172 
         caseid: '',
171 173 
         page: 1,
172 
-        pagesize: 6,
174 
+        pagesize: 10
173 175 
       },
174 
-      dialogTotal: 0,
175 176 
     }
176 177 
   },
177 178 
   mounted () {

@@ -253,12 +254,17 @@ export default {
253 254 
       if (this.code && this.code !== '') {
254 255 
         this.GetCourseVerList({ id: this.code, page: this.page, pagesize: this.pagesize }).then((res) => {
255 256 
           res.list = res.list || []
257 
+          this.page = res.page
258 
+          this.total = res.pagenum
256 259 
           this.courses = res.list
257 260 
         })
258 261 
       } else {
259 262 
         if (this.tel && this.tel !== '') {
260 263 
           this.GetCourseVerListByTel({ tel: this.tel, page: this.page, pagesize: this.pagesize }).then((res) => {
261 264 
             res.list = res.list || []
265 
+            console.log(JSON.stringify(res))
266 
+            this.page = res.page
267 
+            this.total = res.pagenum
262 268 
             this.courses = res.list
263 269 
           })
264 270 
         }

+ 2
- 2
src/util/api.js View File 

@@ -1,5 +1,5 @@
1 
-const baseUrl = '/api-v2'
2 
-// const baseUrl = '/api'
1 
+// const baseUrl = '/api-v2'
2 
+const baseUrl = '/api'
3 3 
 const common = '/common/:org'
4 4 
 const guest = '/guest/:org'
5 5