SpaceOfCheng
/
admin
Observar 3
Favorito 0
Fork 0
Código Issues 0 Pull Requests 0 Versões 2 Atividade
Ver código fonte

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

wangfei 6 anos atrás
pai
9f512f73ff 0ca89a10ed
commit
799ba350de
6 arquivos alterados com 32 adições e 13 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 1
    1
      dist/index.html
  2. 2
    1
      src/pages/system/cardAndCouponManager/cardManager/edit.vue
  3. 6
    7
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  4. 21
    2
      src/pages/system/cmsManager/majorProjects/edit.vue
  5. 1
    1
      src/pages/system/dataStatistics/goodsOrderList/index.vue
  6. 1
    1
      src/pages/system/newOrder/newOrderList/index.vue

+ 1
- 1
dist/index.html Ver arquivo 

@@ -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.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 Ver arquivo 

@@ -145,7 +145,6 @@
145 145 
             <div style="vertical-align: middle;">
146 146 
               <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>
147 147 
               <el-upload
148 
-                :disabled="isEdit"
149 148 
                 class="avatar-uploader"
150 149 
                 action='string'
151 150 
                 :http-request="toolClass.upload"

@@ -265,11 +264,13 @@ export default {
265 264 
           page: 1,
266 265 
           pagesize: 10000
267 266 
         }).then((res) => {
267 
+          // console.log(JSON.stringify(res))
268 268 
           this.courseList = res.list
269 269 
           if (this.$route.query.id) {
270 270 
             this.getCardById({
271 271 
               id: this.$route.query.id
272 272 
             }).then((res) => {
273 
+              // console.log(JSON.stringify(res))
273 274 
               if (res.Card.CaseId !== '') {
274 275 
                 var aRes = res
275 276 
                 this.GetChannelListList({

+ 6
- 7
src/pages/system/cardAndCouponManager/couponManager/edit.vue Ver arquivo 

@@ -224,7 +224,6 @@
224 224 
             <div style="vertical-align: middle;">
225 225 
               <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.VideoUrl}}</a>
226 226 
               <el-upload
227 
-                :disabled="isEdit"
228 227 
                 class="avatar-uploader"
229 228 
                 action='string'
230 229 
                 :http-request="toolClass.upload"

@@ -232,7 +231,7 @@
232 231 
                 :on-success="videoSuccess">
233 232 
                 <a style="line-height: 40px;padding: 0 10px;" :disabled="isEdit">{{videoOff ? '更换' : '添加'}}视频</a>
234 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 235 
             </div>
237 236 
           </div>
238 237 
         </li>

@@ -404,7 +403,7 @@ export default {
404 403 
         Price: '',
405 404 
         TotalCount: '',
406 405 
         SendType: '',
407 
-        IsAll: '',
406 
+        IsAll: 1,
408 407 
         StartDate: '',
409 408 
         EndDate: '',
410 409 
         ValidDays: '',

@@ -685,7 +684,7 @@ export default {
685 684 
         })
686 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 688 
         this.$message({
690 689 
           type: 'error',
691 690 
           message: '目标商品不能为空'

@@ -745,6 +744,9 @@ export default {
745 744 
           })
746 745 
         })
747 746 
       } else {
747 
+        if (!this.checkInfo()) {
748 
+          return false
749 
+        }
748 750 
         if (this.couponInfo.ValidDays) {
749 751 
           this.couponInfo.StartDate = undefined
750 752 
           this.couponInfo.EndDate = undefined

@@ -771,9 +773,6 @@ export default {
771 773 
             return false
772 774 
           }
773 775 
         }
774 
-        if (!this.checkInfo()) {
775 
-          return false
776 
-        }
777 776 
         this.addCoupon({
778 777 
           ...this.couponInfo,
779 778 
           IsAll: this.couponInfo.IsAll - 0,

+ 21
- 2
src/pages/system/cmsManager/majorProjects/edit.vue Ver arquivo 

@@ -183,6 +183,13 @@
183 183 
           </el-table-column>
184 184 
         </el-table>
185 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 193 
       <span slot="footer" class="dialog-footer">
187 194 
         <el-button @click="selCourseVisible = false">取 消</el-button>
188 195 
         <el-button type="primary" @click="addCourseOk">确 定</el-button>

@@ -209,6 +216,11 @@ export default {
209 216 
       detailimg: '',
210 217 
       selCourseVisible: false,
211 218 
       selCourseList: [],
219 
+      postData: {
220 
+        page: 1,
221 
+        pagesize: 6
222 
+      },
223 
+      total: 0,
212 224 
     }
213 225 
   },
214 226 
   components: {},

@@ -276,6 +288,10 @@ export default {
276 288 
       }
277 289 
       return true
278 290 
     },
291 
+    handleCurrentChange (val) {
292 
+      this.postData.page = val
293 
+      this.getCourse()
294 
+    },
279 295 
     submit () {
280 296 
       var checkOff = this.checkFn([{
281 297 
         target: Boolean(this.CaseId || ''),

@@ -309,7 +325,7 @@ export default {
309 325 
       if (!checkOff) {
310 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 329 
         this.$message({
314 330 
           message: '选择指定课程不能为空',
315 331 
           type: 'error'

@@ -345,7 +361,10 @@ export default {
345 361 
       this.GetCaseInfo({ id: this.id })
346 362 
     },
347 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 369 
     toggleSelection (rows) {
351 370 
       if (rows) {

+ 1
- 1
src/pages/system/dataStatistics/goodsOrderList/index.vue Ver arquivo 

@@ -113,7 +113,7 @@
113 113 
             <div style="font-size:12px;">下单人：{{returnListItem(goodsOrderList, index).CustomerName}}</div>
114 114 
             <span style="display:block;margin-top:10px;font-size:12px;">下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
115 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 117 
           <div style="text-align: right;font-size: 12px;">城的空间.城咖啡</div>
118 118 
           <div style="height:10px"></div>
119 119 
         </div>

+ 1
- 1
src/pages/system/newOrder/newOrderList/index.vue Ver arquivo 

@@ -43,7 +43,7 @@
43 43 
               <span style="display:inline-block;width:20%;text-align:right">× {{item1.Number}}</span>
44 44 
             </div>
45 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 47 
           <div style="padding:10px 20px;" @click="printPdf(`item${index}`)">下单人：{{item.UserName}}</div>
48 48 
         </div>
49 49 
         <div class="print-area" :class="'item_' + item.OrdersId" style="width:180px;">