xcx

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

@@ -390,14 +390,13 @@ export default {
           }
         }
         this.cardInfo.TotalCount = this.cardInfo.TotalCount - 0
-        console.log(JSON.stringify(this.cardInfo))
+        // console.log(JSON.stringify(this.cardInfo))
         this.addCard(this.cardInfo).then((res) => {
-          this.$alert('操作成功', '提示', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.$router.push({ name: 'cardList' })
-            }
+          this.$message({
+            type: 'success',
+            message: '操作成功'
           })
+          this.$router.push({ name: 'cardList' })
         })
       }
     },

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

@@ -608,12 +608,11 @@ export default {
           TotalCount: this.couponInfo.TotalCount - 0,
           ValidDays: this.couponInfo.ValidDays - 0 || 0
         }).then((res) => {
-          this.$alert('操作成功', '提示', {
-            confirmButtonText: '确定',
-            callback: action => {
-              this.$router.push({ name: 'couponList' })
-            }
+          this.$message({
+            type: 'success',
+            message: '操作成功'
           })
+          this.$router.push({ name: 'couponList' })
         })
       }
     },

src/pages/system/cardAndCouponManager/vipManager/activateVip.vue

@@ -149,7 +149,7 @@ export default {
         })
         return
       }
-      this.GetCustomerByTel({tel: this.customerPhone})
+      this.GetCustomerByTel({ tel: this.customerPhone })
     },
     searchSeller () {
       if (this.salesPhone === '') {
@@ -159,7 +159,7 @@ export default {
         })
         return
       }
-      this.GetUserByTel({tel: this.salesPhone})
+      this.GetUserByTel({ tel: this.salesPhone })
     },
     setNull () {
       this.salesPhone = ''
@@ -168,24 +168,31 @@ export default {
       this.SetCustomerInfoNull()
     },
     activateVip () {
-      this.GetVipByCode({ code: this.CardNo }).then((res) => {
-        if (res) {
-          if (res.Status !== 0) {
+      if (this.CardNo !== '') {
+        this.GetVipByCode({ code: this.CardNo }).then((res) => {
+          if (res) {
+            if (res.Status !== 0) {
+              this.$message({
+                type: 'error',
+                message: 'VIP卡已被激活！',
+              })
+              return
+            }
+            this.setNull()
+            this.centerDialogVisible = true
+          } else {
             this.$message({
               type: 'error',
-              message: 'VIP卡已被激活！',
+              message: '没有查询到VIP卡信息！',
             })
-            return
           }
-          this.setNull()
-          this.centerDialogVisible = true
-        } else {
-          this.$message({
-            type: 'error',
-            message: '没有查询到VIP卡信息！',
-          })
-        }
-      })
+        })
+      } else {
+        this.$message({
+          type: 'error',
+          message: '请输入VIP卡号！',
+        })
+      }
     },
     vipCharge () {
       if (this.vip.VipCardChildCode === '') {

src/pages/system/caseManager/caseAreaManager/add.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>区域名：</span>
+          <span>区域名：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -17,7 +17,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>案场：</span>
+          <span>案场：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="CaseId" placeholder="请选择">
@@ -32,7 +32,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片：</span>
+          <span>图片：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-upload
@@ -48,7 +48,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>黑白图片：</span>
+          <span>黑白图片：<em>*</em></span>
           <div class="flex-item">
             <div>
               <el-upload
@@ -120,6 +120,13 @@ export default {
         })
         return false
       }
+      if (this.postData.CaseId === '') {
+        this.$message({
+          type: 'error',
+          message: '案场不能为空'
+        })
+        return false
+      }
       if (this.postData.AreaIcon === '') {
         this.$message({
           type: 'error',

src/pages/system/cmsManager/bannerManager/add.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>跳转类型：</span>
+          <span>跳转类型：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
                 <el-radio v-model="postData.ForwardType" label='url' >链接</el-radio>
@@ -12,7 +12,7 @@
           </div>
         </li>
         <li class="flex-h" v-if="postData.ForwardType==='url'">
-          <span>链接：</span>
+          <span>链接：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -24,7 +24,7 @@
           </div>
         </li>
         <li class="flex-h" v-else>
-          <span>课程：</span>
+          <span>课程：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
@@ -39,7 +39,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>是否发布：</span>
+          <span>是否发布：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
               <el-radio v-model="postData.Status" label='1' >是</el-radio>
@@ -48,7 +48,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片位置：</span>
+          <span>图片位置：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="postData.LocationId" placeholder="请选择">
@@ -75,22 +75,8 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片：</span>
+          <span>图片：<em>*</em></span>
           <div class="flex-item">
-            <!-- <el-upload
-              action='string'
-              :http-request="toolClass.upload"
-              :limit='limit'
-              list-type="picture-card"
-              :file-list='imgsArr'
-              :on-success="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="exceed">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="imgs" alt="">
-            </el-dialog> -->
             <el-upload
               class="avatar-uploader"
               action='string'
@@ -100,26 +86,8 @@
               <img v-if="postData.ImageUrl" :src="postData.ImageUrl" class="avatar">
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
-            <!-- <div>
-              <image-uploader :upload="uploader" v-model="postData.ImageUrl" />
-            </div> -->
           </div>
         </li>
-        <!-- <li class="flex-h">
-          <span>对应案场：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-select v-model="postData.CaseId" placeholder="请选择">
-                <el-option
-                  v-for="item in caseList"
-                  :key="item.CaseId"
-                  :label="item.CaseName"
-                  :value="item.CaseId">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-        </li> -->
         <li style="text-align:center">
           <el-button type="primary" size="mini" @click="submit">保存</el-button>
           <el-button type="danger" size="mini" @click="cancel">取消</el-button>
@@ -187,7 +155,7 @@ export default {
     ...mapCmsActions(['updateLocationAllInfo']),
     ...mapActions(['updateSystemInfo']),
     submit () {
-      if (this.postData.ForwardType === '1') {
+      if (this.postData.ForwardType === 'url') {
         this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
@@ -196,7 +164,6 @@ export default {
           })
           return false
         } else {
-          // var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
           var reg = /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/  // eslint-disable-line
           if (!reg.test(this.postData.ForwardUrl)) {
             this.$message({
@@ -208,6 +175,27 @@ export default {
         }
       } else {
         this.postData.ForwardUrl = ''
+        if (this.postData.ForwardResourceId === '') {
+          this.$message({
+            message: '课程不能为空',
+            type: 'error',
+          })
+          return false
+        }
+      }
+      if (this.postData.LocationId === '') {
+        this.$message({
+          message: '图片位置不能为空',
+          type: 'error',
+        })
+        return false
+      }
+      if (this.postData.ImageUrl === '') {
+        this.$message({
+          message: '图片不能为空',
+          type: 'error',
+        })
+        return false
       }
       this.postData.OrgId = this.OrgId
       // this.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'

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

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>跳转类型：</span>
+          <span>跳转类型：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
                 <el-radio v-model="postData.ForwardType" label='1' >链接</el-radio>
@@ -12,7 +12,7 @@
           </div>
         </li>
         <li class="flex-h" v-if="postData.ForwardType==='1'">
-          <span>链接：</span>
+          <span>链接：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -24,7 +24,7 @@
           </div>
         </li>
         <li class="flex-h" v-else>
-          <span>课程：</span>
+          <span>课程：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
@@ -39,7 +39,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>是否发布：</span>
+          <span>是否发布：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
               <el-radio v-model="postData.Status" label='1' >是</el-radio>
@@ -48,7 +48,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片位置：</span>
+          <span>图片位置：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="postData.LocationId" placeholder="请选择">
@@ -75,22 +75,8 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片：</span>
+          <span>图片：<em>*</em></span>
           <div class="flex-item">
-            <!-- <el-upload
-              action='string'
-              :http-request="toolClass.upload"
-              :limit='limit'
-              list-type="picture-card"
-              :file-list='imgsArr'
-              :on-success="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="exceed">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="imgs" alt="">
-            </el-dialog> -->
             <el-upload
               class="avatar-uploader"
               action='string'
@@ -102,21 +88,6 @@
             </el-upload>
           </div>
         </li>
-        <!-- <li class="flex-h">
-          <span>对应案场：</span>
-          <div class="flex-item">
-            <div style="width:50%">
-              <el-select v-model="postData.CaseId" placeholder="请选择">
-                <el-option
-                  v-for="item in caseList"
-                  :key="item.CaseId"
-                  :label="item.CaseName"
-                  :value="item.CaseId">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-        </li> -->
         <li style="text-align:center">
           <el-button type="primary" size="mini" @click="submit">保存</el-button>
           <el-button type="danger" size="mini" @click="cancel">取消</el-button>
@@ -173,7 +144,7 @@ export default {
     ]),
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
-      if (this.postData.ForwardType === '1') {
+      if (this.postData.ForwardType === 'url') {
         this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
@@ -182,7 +153,7 @@ export default {
           })
           return false
         } else {
-          var reg = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/  // eslint-disable-line
+          var reg = /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/  // eslint-disable-line
           if (!reg.test(this.postData.ForwardUrl)) {
             this.$message({
               message: '链接地址格式不正确',
@@ -193,6 +164,27 @@ export default {
         }
       } else {
         this.postData.ForwardUrl = ''
+        if (this.postData.ForwardResourceId === '') {
+          this.$message({
+            message: '课程不能为空',
+            type: 'error',
+          })
+          return false
+        }
+      }
+      if (this.postData.LocationId === '') {
+        this.$message({
+          message: '图片位置不能为空',
+          type: 'error',
+        })
+        return false
+      }
+      if (this.postData.ImageUrl === '') {
+        this.$message({
+          message: '图片不能为空',
+          type: 'error',
+        })
+        return false
       }
       this.postData.OrgId = this.OrgId
       this.postData.CaseId = this.CaseId

src/pages/system/cmsManager/newsManager/add.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>跳转类型：</span>
+          <span>跳转类型：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
                 <el-radio v-model="postData.ForwardType" label='url' >链接</el-radio>
@@ -12,7 +12,7 @@
           </div>
         </li>
         <li class="flex-h" v-if="postData.ForwardType==='url'">
-          <span>链接：</span>
+          <span>链接：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -24,7 +24,7 @@
           </div>
         </li>
         <li class="flex-h" v-else>
-          <span>课程：</span>
+          <span>课程：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
@@ -39,7 +39,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>是否发布：</span>
+          <span>是否发布：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
               <el-radio v-model="postData.Status" label='1' >是</el-radio>
@@ -48,7 +48,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片位置：</span>
+          <span>图片位置：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select style="width:100%" v-model="postData.LocationIds" multiple placeholder="请选择">
@@ -63,7 +63,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>标题：</span>
+          <span>标题：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -75,23 +75,8 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片：</span>
+          <span>图片：<em>*</em></span>
           <div class="flex-item">
-            <!-- <el-upload
-              action='string'
-              :http-request="toolClass.upload"
-              :limit='limit'
-              list-type="picture-card"
-              :file-list='imgsArr'
-              :on-success="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="exceed">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="imgs" alt="">
-            </el-dialog> -->
-            <!-- 单选 -->
             <el-upload
               class="avatar-uploader"
               action='string'
@@ -166,7 +151,8 @@ export default {
       'updateLocationAllInfo',
     ]),
     submit () {
-      if (this.postData.ForwardType === '1') {
+      if (this.postData.ForwardType === 'url') {
+        this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
             message: '链接地址不能为空',
@@ -183,8 +169,37 @@ export default {
             return false
           }
         }
+      } else {
+        this.postData.ForwardUrl = ''
+        if (this.postData.ForwardResourceId === '') {
+          this.$message({
+            message: '课程不能为空',
+            type: 'error',
+          })
+          return false
+        }
+      }
+      if (!this.postData.LocationIds.length) {
+        this.$message({
+          message: '图片位置不能为空',
+          type: 'error',
+        })
+        return false
+      }
+      if (this.postData.Title === '') {
+        this.$message({
+          message: '标题不能为空',
+          type: 'error',
+        })
+        return false
+      }
+      if (this.postData.ImageUrl === '') {
+        this.$message({
+          message: '图片不能为空',
+          type: 'error',
+        })
+        return false
       }
-      this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
       this.$ajax(this.$api.cms.addNews.url, {
         method: this.$api.cms.addNews.method,

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

@@ -3,16 +3,16 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>跳转类型：</span>
+          <span>跳转类型：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
-                <el-radio v-model="postData.ForwardType" label='1' >链接</el-radio>
-                <el-radio v-model="postData.ForwardType" label='0' >课程</el-radio>
+                <el-radio v-model="postData.ForwardType" label='url' >链接</el-radio>
+                <el-radio v-model="postData.ForwardType" label='course' >课程</el-radio>
             </div>
           </div>
         </li>
-        <li class="flex-h">
-          <span>链接：</span>
+        <li class="flex-h" v-if="postData.ForwardType==='url'">
+          <span>链接：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -23,8 +23,23 @@
             </div>
           </div>
         </li>
+        <li class="flex-h" v-else>
+          <span>课程：<em>*</em></span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="postData.ForwardResourceId" placeholder="请选择课程">
+                <el-option
+                  v-for="item in courses.list"
+                  :key="item.CourseId"
+                  :label="item.CourseName"
+                  :value="item.CourseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
-          <span>是否发布：</span>
+          <span>是否发布：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%" class="radio">
               <el-radio v-model="postData.Status" label='1' >是</el-radio>
@@ -33,7 +48,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片位置：</span>
+          <span>图片位置：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select style="width:100%" v-model="postData.LocationIds" multiple placeholder="请选择">
@@ -48,7 +63,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>标题：</span>
+          <span>标题：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -60,22 +75,8 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>图片：</span>
+          <span>图片：<em>*</em></span>
           <div class="flex-item">
-            <!-- <el-upload
-              action='string'
-              :http-request="toolClass.upload"
-              :limit='limit'
-              list-type="picture-card"
-              :file-list='imgsArr'
-              :on-success="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="exceed">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <el-dialog :visible.sync="dialogVisible">
-              <img width="100%" :src="imgs" alt="">
-            </el-dialog> -->
             <el-upload
               class="avatar-uploader"
               action='string'
@@ -104,7 +105,7 @@ export default {
   data () {
     return {
       postData: {
-        ForwardType: '1',
+        ForwardType: 'url',
         ForwardUrl: '',
         ForwardResourceId: '',
         Status: '1',
@@ -134,7 +135,8 @@ export default {
   methods: {
     ...mapCmsActions(['updateLocationInfo']),
     submit () {
-      if (this.postData.ForwardType === '1') {
+      if (this.postData.ForwardType === 'url') {
+        this.postData.ForwardResourceId = ''
         if (this.postData.ForwardUrl === '') {
           this.$message({
             message: '链接地址不能为空',
@@ -151,16 +153,38 @@ export default {
             return false
           }
         }
+      } else {
+        this.postData.ForwardUrl = ''
+        if (this.postData.ForwardResourceId === '') {
+          this.$message({
+            message: '课程不能为空',
+            type: 'error',
+          })
+          return false
+        }
+      }
+      if (!this.postData.LocationIds.length) {
+        this.$message({
+          message: '图片位置不能为空',
+          type: 'error',
+        })
+        return false
+      }
+      if (this.postData.Title === '') {
+        this.$message({
+          message: '标题不能为空',
+          type: 'error',
+        })
+        return false
+      }
+      if (this.postData.ImageUrl === '') {
+        this.$message({
+          message: '图片不能为空',
+          type: 'error',
+        })
+        return false
       }
-      this.postData.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.postData.locationids = this.postData.LocationIds.join(',')
-      // this.postData.ImageUrl = ''
-      // for (let i = 0; i < this.imgsArr.length; i++) {
-      //   this.postData.ImageUrl += this.imgsArr[i].response.result.url + ','
-      // }
-      // if (this.postData.ImageUrl) {
-      //   this.postData.ImageUrl = this.postData.ImageUrl.substr(0, this.postData.ImageUrl.length - 1)
-      // }
       this.$ajax(this.$api.cms.editNews.url, {
         method: this.$api.cms.editNews.method,
         urlData: {
@@ -183,21 +207,6 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    // handlePictureCardPreview (res, file, fileList) {
-    //   this.imgs = res.result.url
-    //   this.dialogVisible = false
-    //   this.imgsArr = fileList
-    // },
-    // handleRemove (file, fileList) {
-    //   this.imgsArr = fileList
-    // },
-    // exceed () {
-    //   this.$message({
-    //     message: '超过可传的图片上限',
-    //     type: 'info',
-    //     duration: 1000
-    //   })
-    // },
     getDetail () {
       this.$ajax(this.$api.cms.newsDetail.url, {
         method: this.$api.cms.newsDetail.method,
@@ -208,22 +217,9 @@ export default {
         res.ForwardType === 'url' ? res.ForwardType = '1' : res.ForwardType = '0'
         res.Status += ''
         res.LocationIds = res.NewsLocations.reduce((previousValue, currentValue, index, array) => {
-          console.log(previousValue)
           previousValue.push(currentValue.LocationId)
           return previousValue
         }, [])
-        console.log(res.LocationIds)
-        // let imgsArr = []
-        // let item = {
-        //   url: res.ImageUrl,
-        //   response: {
-        //     result: {
-        //       url: res.ImageUrl
-        //     }
-        //   }
-        // }
-        // imgsArr.push(item)
-        // this.imgsArr = imgsArr
         this.postData = res
       }).catch(msg => {
 

src/pages/system/dashboard/index.vue

@@ -101,18 +101,20 @@ export default {
       }
     }
   },
-  created () {
-    this.postData.caseid = this.postData.caseid || this.cases[0].CaseId
-    this.getDashboardData({
-      caseid: this.postData.caseid
-    }).then((res) => {
-      console.log(JSON.stringify(res))
-    })
-    this.getDashboardBottomData({
-      caseid: this.postData.caseid,
-      statype: 'week'
-    }).then((res) => {
-      console.log(JSON.stringify(res))
+  mounted () {
+    this.$nextTick(function () {
+      this.postData.caseid = this.postData.caseid || this.cases[0].CaseId
+      this.getDashboardData({
+        caseid: this.postData.caseid
+      }).then((res) => {
+        console.log(JSON.stringify(res))
+      })
+      this.getDashboardBottomData({
+        caseid: this.postData.caseid,
+        statype: 'week'
+      }).then((res) => {
+        console.log(JSON.stringify(res))
+      })
     })
   },
   methods: {

src/pages/system/goodsManager/goodManager/edit.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
          <li class="flex-h">
-          <span>选择案场：</span>
+          <span>选择案场：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="Case" placeholder="请选择">
@@ -18,7 +18,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>商品名称：</span>
+          <span>商品名称：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -30,22 +30,9 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>商品图片：</span>
+          <span>商品图片：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
-              <!-- 多选 -->
-              <!-- <el-upload
-                action='string'
-                :http-request="toolClass.upload"
-                :limit='limit'
-                list-type="picture-card"
-                :file-list='imgsArr'
-                :on-success="handlePictureCardPreview"
-                :on-remove="handleRemove"
-                :on-exceed="exceed">
-                <i class="el-icon-plus"></i>
-              </el-upload> -->
-              <!-- 单选 -->
               <el-upload
                 class="avatar-uploader"
                 action='string'
@@ -59,7 +46,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>商品价格：</span>
+          <span>商品价格：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -86,7 +73,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>商品类别：</span>
+          <span>商品类别：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-select v-model="detail.TypeId" placeholder="请选择商品类型">
@@ -139,7 +126,7 @@ export default {
         return this.detail.CaseId || this.caseid
       },
       set (val) {
-        this.UpdateInfo({...this.detail, CaseId: val})
+        this.UpdateInfo({ ...this.detail, CaseId: val })
         this.detail.TypeId = ''
         this.GetGoodTypes({ pagesize: 1000, caseid: this.Case })
         this.GetGoodSpecs({ pagesize: 1000, caseid: this.Case })
@@ -147,18 +134,13 @@ export default {
     },
     detailSpecs: {
       get () {
-        console.log(this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId))
+        // console.log(this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId))
         return this.infoSpecs || (this.detail.Specs || []).map(x => x.SpecId)
       },
       set (val) {
         this.infoSpecs = val
       },
     },
-    // imgsArr () {
-    //   return (this.detail.Images || []).map(x => {
-    //     return {...x, url: x.url || x.ImgUrl}
-    //   })
-    // },
     Image () {
       return ((this.detail.Images || [])[0] || {}).ImgUrl
     }
@@ -174,14 +156,49 @@ export default {
       'GetGoodSpecs',
     ]),
     submit () {
-      this.detail.specs = JSON.stringify(this.detailSpecs.map(x => ({SpecId: x, GoodsPrice: this.detail.Price})))
-      this.detail.images = this.detail.Images.map(x => {
+      this.detail.specs = JSON.stringify(this.detailSpecs.map(x => ({ SpecId: x, GoodsPrice: this.detail.Price })))
+      this.detail.images = (this.detail.Images || []).map(x => {
         if (x.response) {
           return x.response.result.url
         } else {
           return x.ImgUrl
         }
       }).join(',')
+      if ((this.detail.CaseId || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '案场不能为空'
+        })
+        return false
+      }
+      if ((this.detail.GoodsName || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '商品名称不能为空'
+        })
+        return false
+      }
+      if ((this.detail.Images || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '图片不能为空'
+        })
+        return false
+      }
+      if ((this.detail.Price || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '价格不能为空'
+        })
+        return false
+      }
+      if ((this.detail.TypeId || '') === '') {
+        this.$message({
+          type: 'error',
+          message: '类别不能为空'
+        })
+        return false
+      }
       if ((this.detail.GoodsId || '') === '') {
         this.detail.OrgId = this.orgid
         if (!this.detail.CaseId || this.detail.CaseId === '') {
@@ -200,21 +217,8 @@ export default {
     cancel () {
       this.$router.go(-1)
     },
-    // handlePictureCardPreview (res, file, fileList) {
-    //   this.detail.Images = fileList
-    // },
-    // handleRemove (file, fileList) {
-    //   this.detail.Images = fileList
-    // },
-    // exceed () {
-    //   this.$message({
-    //     message: '超过可传的图片上限',
-    //     type: 'info',
-    //     duration: 1000
-    //   })
-    // },
     handleAvatarSuccess (res, file) {
-      this.UpdateInfo({...this.detail, Images: [{ImgUrl: res.result.url}]})
+      this.UpdateInfo({ ...this.detail, Images: [{ ImgUrl: res.result.url }] })
     },
   },
   created () {

src/pages/system/systemSet/userManager/add.vue

@@ -3,7 +3,7 @@
     <form class="mainForm">
       <ul>
         <li class="flex-h">
-          <span>帐户名称：</span>
+          <span>帐户名称：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -39,7 +39,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>真实姓名：</span>
+          <span>真实姓名：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -51,7 +51,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>邮箱：</span>
+          <span>邮箱：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -75,7 +75,7 @@
           </div>
         </li>
         <li class="flex-h">
-          <span>手机号：</span>
+          <span>手机号：<em>*</em></span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
@@ -219,21 +219,27 @@ export default {
         })
         return false
       }
+      if (this.postData.RealName === '') {
+        this.$message({
+          type: 'error',
+          message: '真实姓名不能为空'
+        })
+        return false
+      }
       if (this.postData.Phone === '') {
         this.$message({
           type: 'error',
           message: '手机号不能为空'
         })
         return false
-      } else {
-        var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
-        if (!myreg.test(this.postData.Phone)) {
-          this.$message({
-            type: 'error',
-            message: '请输入正确的手机号！'
-          })
-          return false
-        }
+      }
+      var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
+      if (!myreg.test(this.postData.Phone)) {
+        this.$message({
+          type: 'error',
+          message: '请输入正确的手机号！'
+        })
+        return false
       }
       if (this.postData.Email !== '') {
         var emailreg = new RegExp('^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$')

src/pages/system/systemSet/userManager/edit.vue

@@ -237,21 +237,27 @@ export default {
         })
         return false
       }
+      if (this.postData.RealName === '') {
+        this.$message({
+          type: 'error',
+          message: '真实姓名不能为空'
+        })
+        return false
+      }
       if (this.postData.Phone === '') {
         this.$message({
           type: 'error',
           message: '手机号不能为空'
         })
         return false
-      } else {
-        var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
-        if (!myreg.test(this.postData.Phone)) {
-          this.$message({
-            type: 'error',
-            message: '请输入正确的手机号！'
-          })
-          return false
-        }
+      }
+      var myreg = /^[1][3,4,5,6,7,8][0-9]{9}$/
+      if (!myreg.test(this.postData.Phone)) {
+        this.$message({
+          type: 'error',
+          message: '请输入正确的手机号！'
+        })
+        return false
       }
       if (this.postData.Email !== '') {
         var emailreg = new RegExp('^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$')

src/style/main.css

@@ -251,6 +251,10 @@ select:focus {
   min-width: 110px;
 }
 
+.mainForm>ul>li>span:first-child>em{
+  color: red;
+}
+
 .mainForm>ul>li>div>div{
   min-height: 40px;
   vertical-align: top;