xcx

src/pages/system/cardAndCouponManager/cardManager/edit.vue

@@ -144,7 +144,6 @@
             <div style="vertical-align: middle;">
               <a style="line-height: 40px;" v-if="videoOff" :href="cardInfo.VideoUrl" target="blank">{{cardInfo.VideoUrl}}</a>
               <el-upload
-                :disabled="isEdit"
                 class="avatar-uploader"
                 action='string'
                 :http-request="toolClass.upload"
@@ -264,11 +263,13 @@ export default {
           page: 1,
           pagesize: 10000
         }).then((res) => {
+          // console.log(JSON.stringify(res))
           this.courseList = res.list
           if (this.$route.query.id) {
             this.getCardById({
               id: this.$route.query.id
             }).then((res) => {
+              // console.log(JSON.stringify(res))
               if (res.Card.CaseId !== '') {
                 var aRes = res
                 this.GetChannelListList({

src/pages/system/cardAndCouponManager/couponManager/edit.vue

@@ -224,7 +224,6 @@
             <div style="vertical-align: middle;">
               <a style="line-height: 40px;" v-if="videoOff" :href="couponInfo.VideoUrl" target="blank">{{couponInfo.VideoUrl}}</a>
               <el-upload
-                :disabled="isEdit"
                 class="avatar-uploader"
                 action='string'
                 :http-request="toolClass.upload"
@@ -232,7 +231,7 @@
                 :on-success="videoSuccess">
                 <a style="line-height: 40px;padding: 0 10px;" :disabled="isEdit">{{videoOff ? '更换' : '添加'}}视频</a>
               </el-upload>
-              <el-button v-if="videoOff" type="danger" @click="deleteVideo" :disabled="isEdit">删除视频</el-button>
+              <el-button v-if="videoOff" type="danger" @click="deleteVideo">删除视频</el-button>
             </div>
           </div>
         </li>
@@ -404,7 +403,7 @@ export default {
         Price: '',
         TotalCount: '',
         SendType: '',
-        IsAll: '',
+        IsAll: 1,
         StartDate: '',
         EndDate: '',
         ValidDays: '',
@@ -685,7 +684,7 @@ export default {
         })
         return false
       }
-      if (this.couponInfo.IsAll === 0 && this.couponInfo.Targets[0].TargetId === '') {
+      if (!(this.couponInfo.IsAll - 0) && !this.courseList.length && !this.goodsList.length) {
         this.$message({
           type: 'error',
           message: '目标商品不能为空'

src/pages/system/cmsManager/majorProjects/edit.vue

@@ -183,6 +183,13 @@
           </el-table-column>
         </el-table>
       </div>
+      <el-pagination
+        @current-change="handleCurrentChange"
+        :current-page.sync="postData.page"
+        :page-size="postData.pagesize"
+        layout="prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
       <span slot="footer" class="dialog-footer">
         <el-button @click="selCourseVisible = false">取 消</el-button>
         <el-button type="primary" @click="addCourseOk">确 定</el-button>
@@ -209,6 +216,11 @@ export default {
       detailimg: '',
       selCourseVisible: false,
       selCourseList: [],
+      postData: {
+        page: 1,
+        pagesize: 6
+      },
+      total: 0,
     }
   },
   components: {},
@@ -276,6 +288,10 @@ export default {
       }
       return true
     },
+    handleCurrentChange (val) {
+      this.postData.page = val
+      this.getCourse()
+    },
     submit () {
       var checkOff = this.checkFn([{
         target: Boolean(this.CaseId || ''),
@@ -309,7 +325,7 @@ export default {
       if (!checkOff) {
         return false
       }
-      if (this.detail.IsAllCourse === '0' && !this.detail.Courses.length) {
+      if (this.detail.IsAllCourse === 0 && !this.detail.Courses.length) {
         this.$message({
           message: '选择指定课程不能为空',
           type: 'error'
@@ -345,7 +361,10 @@ export default {
       this.GetCaseInfo({ id: this.id })
     },
     getCourse () {
-      this.GetCourseList({ caseid: this.CaseId === 'all' ? '' : this.CaseId, page: 1, pagesize: 100, status: 1 })
+      this.GetCourseList({ caseid: this.CaseId === 'all' ? '' : this.CaseId, ...this.postData, callback: this.coursesShow }).then((res) => {
+        this.postData.page = res.page
+        this.total = res.pagenum
+      })
     },
     toggleSelection (rows) {
       if (rows) {

src/pages/system/dataStatistics/goodsOrderList/index.vue

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

src/pages/system/newOrder/newOrderList/index.vue

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