Procházet zdrojové kódy

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

wangfei před 6 roky
rodič
revize
799ba350de

+ 1
- 1
dist/index.html Zobrazit soubor

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.224e2a86393b63b0994faf1e7bd8710a.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.15196c425f3d13398719.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.2cdb845c0d5d55c26614acbd6458e5d7.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.7d24608c728c729ad3a2.js></script></body></html>

+ 2
- 1
src/pages/system/cardAndCouponManager/cardManager/edit.vue Zobrazit soubor

145
             <div style="vertical-align: middle;">
145
             <div style="vertical-align: middle;">
146
               <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>
146
               <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>
147
               <el-upload
147
               <el-upload
148
-                :disabled="isEdit"
149
                 class="avatar-uploader"
148
                 class="avatar-uploader"
150
                 action='string'
149
                 action='string'
151
                 :http-request="toolClass.upload"
150
                 :http-request="toolClass.upload"
265
           page: 1,
264
           page: 1,
266
           pagesize: 10000
265
           pagesize: 10000
267
         }).then((res) => {
266
         }).then((res) => {
267
+          // console.log(JSON.stringify(res))
268
           this.courseList = res.list
268
           this.courseList = res.list
269
           if (this.$route.query.id) {
269
           if (this.$route.query.id) {
270
             this.getCardById({
270
             this.getCardById({
271
               id: this.$route.query.id
271
               id: this.$route.query.id
272
             }).then((res) => {
272
             }).then((res) => {
273
+              // console.log(JSON.stringify(res))
273
               if (res.Card.CaseId !== '') {
274
               if (res.Card.CaseId !== '') {
274
                 var aRes = res
275
                 var aRes = res
275
                 this.GetChannelListList({
276
                 this.GetChannelListList({

+ 6
- 7
src/pages/system/cardAndCouponManager/couponManager/edit.vue Zobrazit soubor

224
             <div style="vertical-align: middle;">
224
             <div style="vertical-align: middle;">
225
               <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.VideoUrl}}</a>
225
               <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.VideoUrl}}</a>
226
               <el-upload
226
               <el-upload
227
-                :disabled="isEdit"
228
                 class="avatar-uploader"
227
                 class="avatar-uploader"
229
                 action='string'
228
                 action='string'
230
                 :http-request="toolClass.upload"
229
                 :http-request="toolClass.upload"
232
                 :on-success="videoSuccess">
231
                 :on-success="videoSuccess">
233
                 <a style="line-height: 40px;padding: 0 10px;" :disabled="isEdit">{{videoOff ? '更换' : '添加'}}视频</a>
232
                 <a style="line-height: 40px;padding: 0 10px;" :disabled="isEdit">{{videoOff ? '更换' : '添加'}}视频</a>
234
               </el-upload>
233
               </el-upload>
235
-              <el-button v-if="videoOff" type="danger" @click="deleteVideo" :disabled="isEdit">删除视频</el-button>
234
+              <el-button v-if="videoOff" type="danger" @click="deleteVideo">删除视频</el-button>
236
             </div>
235
             </div>
237
           </div>
236
           </div>
238
         </li>
237
         </li>
404
         Price: '',
403
         Price: '',
405
         TotalCount: '',
404
         TotalCount: '',
406
         SendType: '',
405
         SendType: '',
407
-        IsAll: '',
406
+        IsAll: 1,
408
         StartDate: '',
407
         StartDate: '',
409
         EndDate: '',
408
         EndDate: '',
410
         ValidDays: '',
409
         ValidDays: '',
685
         })
684
         })
686
         return false
685
         return false
687
       }
686
       }
688
-      if (this.couponInfo.IsAll === 0 && this.couponInfo.Targets[0].TargetId === '') {
687
+      if (!(this.couponInfo.IsAll - 0) && !this.courseList.length && !this.goodsList.length) {
689
         this.$message({
688
         this.$message({
690
           type: 'error',
689
           type: 'error',
691
           message: '目标商品不能为空'
690
           message: '目标商品不能为空'
745
           })
744
           })
746
         })
745
         })
747
       } else {
746
       } else {
747
+        if (!this.checkInfo()) {
748
+          return false
749
+        }
748
         if (this.couponInfo.ValidDays) {
750
         if (this.couponInfo.ValidDays) {
749
           this.couponInfo.StartDate = undefined
751
           this.couponInfo.StartDate = undefined
750
           this.couponInfo.EndDate = undefined
752
           this.couponInfo.EndDate = undefined
771
             return false
773
             return false
772
           }
774
           }
773
         }
775
         }
774
-        if (!this.checkInfo()) {
775
-          return false
776
-        }
777
         this.addCoupon({
776
         this.addCoupon({
778
           ...this.couponInfo,
777
           ...this.couponInfo,
779
           IsAll: this.couponInfo.IsAll - 0,
778
           IsAll: this.couponInfo.IsAll - 0,

+ 21
- 2
src/pages/system/cmsManager/majorProjects/edit.vue Zobrazit soubor

183
           </el-table-column>
183
           </el-table-column>
184
         </el-table>
184
         </el-table>
185
       </div>
185
       </div>
186
+      <el-pagination
187
+        @current-change="handleCurrentChange"
188
+        :current-page.sync="postData.page"
189
+        :page-size="postData.pagesize"
190
+        layout="prev, pager, next, jumper"
191
+        :total="total">
192
+      </el-pagination>
186
       <span slot="footer" class="dialog-footer">
193
       <span slot="footer" class="dialog-footer">
187
         <el-button @click="selCourseVisible = false">取 消</el-button>
194
         <el-button @click="selCourseVisible = false">取 消</el-button>
188
         <el-button type="primary" @click="addCourseOk">确 定</el-button>
195
         <el-button type="primary" @click="addCourseOk">确 定</el-button>
209
       detailimg: '',
216
       detailimg: '',
210
       selCourseVisible: false,
217
       selCourseVisible: false,
211
       selCourseList: [],
218
       selCourseList: [],
219
+      postData: {
220
+        page: 1,
221
+        pagesize: 6
222
+      },
223
+      total: 0,
212
     }
224
     }
213
   },
225
   },
214
   components: {},
226
   components: {},
276
       }
288
       }
277
       return true
289
       return true
278
     },
290
     },
291
+    handleCurrentChange (val) {
292
+      this.postData.page = val
293
+      this.getCourse()
294
+    },
279
     submit () {
295
     submit () {
280
       var checkOff = this.checkFn([{
296
       var checkOff = this.checkFn([{
281
         target: Boolean(this.CaseId || ''),
297
         target: Boolean(this.CaseId || ''),
309
       if (!checkOff) {
325
       if (!checkOff) {
310
         return false
326
         return false
311
       }
327
       }
312
-      if (this.detail.IsAllCourse === '0' && !this.detail.Courses.length) {
328
+      if (this.detail.IsAllCourse === 0 && !this.detail.Courses.length) {
313
         this.$message({
329
         this.$message({
314
           message: '选择指定课程不能为空',
330
           message: '选择指定课程不能为空',
315
           type: 'error'
331
           type: 'error'
345
       this.GetCaseInfo({ id: this.id })
361
       this.GetCaseInfo({ id: this.id })
346
     },
362
     },
347
     getCourse () {
363
     getCourse () {
348
-      this.GetCourseList({ caseid: this.CaseId === 'all' ? '' : this.CaseId, page: 1, pagesize: 100, status: 1 })
364
+      this.GetCourseList({ caseid: this.CaseId === 'all' ? '' : this.CaseId, ...this.postData, callback: this.coursesShow }).then((res) => {
365
+        this.postData.page = res.page
366
+        this.total = res.pagenum
367
+      })
349
     },
368
     },
350
     toggleSelection (rows) {
369
     toggleSelection (rows) {
351
       if (rows) {
370
       if (rows) {

+ 1
- 1
src/pages/system/dataStatistics/goodsOrderList/index.vue Zobrazit soubor

113
             <div style="font-size:12px;">下单人:{{returnListItem(goodsOrderList, index).CustomerName}}</div>
113
             <div style="font-size:12px;">下单人:{{returnListItem(goodsOrderList, index).CustomerName}}</div>
114
             <span style="display:block;margin-top:10px;font-size:12px;">下单时间:{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
114
             <span style="display:block;margin-top:10px;font-size:12px;">下单时间:{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
115
           </div>
115
           </div>
116
-          <div style="padding:10px 10px;font-size:12px;">备注:{{item.Remark}}</div>
116
+          <div style="padding:10px 10px;font-size:12px;white-space: normal;">备注:{{item.Remark}}</div>
117
           <div style="text-align: right;font-size: 12px;">城的空间.城咖啡</div>
117
           <div style="text-align: right;font-size: 12px;">城的空间.城咖啡</div>
118
           <div style="height:10px"></div>
118
           <div style="height:10px"></div>
119
         </div>
119
         </div>

+ 1
- 1
src/pages/system/newOrder/newOrderList/index.vue Zobrazit soubor

43
               <span style="display:inline-block;width:20%;text-align:right">× {{item1.Number}}</span>
43
               <span style="display:inline-block;width:20%;text-align:right">× {{item1.Number}}</span>
44
             </div>
44
             </div>
45
           </div>
45
           </div>
46
-          <div style="padding:10px 20px;border-bottom:1px solid #cccccc">备注:{{item.Remark}}</div>
46
+          <div style="padding:10px 20px;border-bottom:1px solid #cccccc;white-space: normal;">备注:{{item.Remark}}</div>
47
           <div style="padding:10px 20px;" @click="printPdf(`item${index}`)">下单人:{{item.UserName}}</div>
47
           <div style="padding:10px 20px;" @click="printPdf(`item${index}`)">下单人:{{item.UserName}}</div>
48
         </div>
48
         </div>
49
         <div class="print-area" :class="'item_' + item.OrdersId" style="width:180px;">
49
         <div class="print-area" :class="'item_' + item.OrdersId" style="width:180px;">