xcx

src/pages/system/cardAndCouponManager/bodyBuildingCardManager/index.vue

@@ -135,13 +135,13 @@
         <ul class="dialogSearchList flex-h">
           <li class="flex-item">
             <el-date-picker
-              value-format="yyyy-MM-ddT00:00:00Z"
+              value-format="yyyy-MM-dd"
               v-model="dialogPostData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <el-date-picker
-              value-format="yyyy-MM-ddT23:59:59Z"
+              value-format="yyyy-MM-dd"
               v-model="dialogPostData.enddate"
               type="date"
               placeholder="选择截止日期">

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

@@ -142,13 +142,13 @@
         <ul class="dialogSearchList flex-h">
           <li class="flex-item">
             <el-date-picker
-              value-format="yyyy-MM-ddT00:00:00Z"
+              value-format="yyyy-MM-dd"
               v-model="dialogPostData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <el-date-picker
-              value-format="yyyy-MM-ddT23:59:59Z"
+              value-format="yyyy-MM-dd"
               v-model="dialogPostData.enddate"
               type="date"
               placeholder="选择截止日期">

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

@@ -133,13 +133,13 @@
         <ul class="dialogSearchList flex-h">
           <li class="flex-item">
             <el-date-picker
-              value-format="yyyy-MM-ddT00:00:00Z"
+              value-format="yyyy-MM-dd"
               v-model="dialogPostData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <el-date-picker
-              value-format="yyyy-MM-ddT23:59:59Z"
+              value-format="yyyy-MM-dd"
               v-model="dialogPostData.enddate"
               type="date"
               placeholder="选择截止日期">

src/pages/system/cardAndCouponManager/givingRecords.vue

@@ -13,14 +13,14 @@
           </li>
           <li>
             <el-date-picker
-              value-format="yyyy-MM-ddT00:00:00Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.startDate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
-              value-format="yyyy-MM-ddT23:59:59Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.endDate"
               type="date"
               placeholder="选择截止日期">
@@ -62,7 +62,7 @@
           prop="CreateDate"
           label="赠送时间">
           <template slot-scope="scope">
-            <span>{{FormatDate(scope.row.CreateDate)}}</span>
+            <span>{{toolClass.dateFormat(scope.row.CreateDate)}}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -127,10 +127,11 @@ export default {
       this.getList()
     },
     getList () { // 获取列表
-      this.$ajax(this.$api.channelManager.getChannelList.url, {
-        method: this.$api.channelManager.getChannelList.method,
+      this.$ajax(this.$api.caseManager.getRecordList.url, {
+        method: this.$api.caseManager.getRecordList.method,
         queryData: { ...this.postData, caseid: this.CaseId }
       }).then(res => {
+        console.log(JSON.stringify(res))
         this.currentList = res.list
         this.postData.page = res.page
         this.total = res.pagenum
@@ -140,7 +141,7 @@ export default {
       this.getList()
     },
     FormatDate (date) {
-      return this.toolClass.dateFormat(date, 'yyyy-MM-ddThh:mm:ss')
+      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
     },
   }
 }

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

@@ -92,14 +92,14 @@
           prop="ActiveDate"
           label="激活时间">
           <template slot-scope="scope">
-            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-ddThh:mm')}}</span>
+            <span>{{toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd')==='1-01-01'?'':toolClass.dateFormat(scope.row.ActiveDate, 'yyyy-MM-dd hh:mm')}}</span>
           </template>
         </el-table-column>
         <el-table-column
           prop="CreateDate"
           label="创建时间">
           <template slot-scope="scope">
-            <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-ddThh:mm')}}</span>
+            <span>{{toolClass.dateFormat(scope.row.CreateDate, 'yyyy-MM-dd hh:mm')}}</span>
           </template>
         </el-table-column>
       </el-table>

src/pages/system/caseManager/signinManager/index.vue

@@ -177,7 +177,7 @@ export default {
       this.$data.valueCase = ''
     },
     FormatDate (date) {
-      return this.toolClass.dateFormat(date, 'yyyy-MM-ddThh:mm:ss')
+      return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
     },
     excelSignin () { // 导出Excel
       window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')

src/pages/system/courseManager/scheduleManager/index.vue

@@ -80,10 +80,10 @@
                   placeholder="选择开始日期"
                   >
                 </el-date-picker>
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm')}}</span>
+                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
               </div>
             </div> -->
-            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm')}}</span>
+            <span>{{this.toolClass.dateFormat(currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
           <li class="flex-h">
             <span>结束时间：</span>
@@ -95,10 +95,10 @@
                   type="datetime"
                   placeholder="选择结束日期">
                 </el-date-picker>
-                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm')}}</span>
+                <span v-else>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
               </div>
             </div> -->
-            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm')}}</span>
+            <span>{{this.toolClass.dateFormat(currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm')}}</span>
           </li>
         </ul>
       </div>
@@ -202,8 +202,8 @@ export default {
     },
     handlUpdateDetail () {
       this.UpdateDetail({...this.currentCourseItem,
-        // BeginDate: this.toolClass.dateFormat(this.currentCourseItem.BeginDate, 'yyyy-MM-ddThh:mm:ss'),
-        // EndDate: this.toolClass.dateFormat(this.currentCourseItem.EndDate, 'yyyy-MM-ddThh:mm:ss'),
+        // BeginDate: this.toolClass.dateFormat(this.currentCourseItem.BeginDate, 'yyyy-MM-dd hh:mm:ss'),
+        // EndDate: this.toolClass.dateFormat(this.currentCourseItem.EndDate, 'yyyy-MM-dd hh:mm:ss'),
         callback: this.AfterAction})
     },
     AfterAction () {

src/pages/system/dashboard/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="subPage">
     <div class="selectCase">
-      <el-select v-model="postData.caseid" placeholder="请选择">
+      <el-select v-model="postData.caseid" placeholder="请选择" @change="caseChange">
         <el-option
           v-for="item in cases"
           :key="item.CaseId"
@@ -15,7 +15,7 @@
         <div v-if="subItem.type === 'dashboardList'">
           <dashboardList :data="subItem" :index="subIndex"></dashboardList>
         </div>
-        <div v-if="subItem.type === 'histogram' && subItem.value.length">
+        <div v-if="subItem.type === 'histogram' && typeof(subItem.value) === 'object' && subItem.value.length">
           <histogram :data="subItem.value" :index="index + '-' + subIndex"></histogram>
         </div>
         <div v-if="subItem.type === 'pieDiagram' && typeof(subItem.value) === 'object' && subItem.value.length">
@@ -91,7 +91,8 @@ export default {
   computed: {
     ...mapState({
       cases: x => x.app.cases.list,
-      defaultCaseId: x => x.app.cases.default
+      defaultCaseId: x => x.app.cases.belongCase,
+      user: x => x.app.user
     }),
     CaseId: {
       get () {
@@ -113,6 +114,10 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      if (this.defaultCaseId !== null) {
+        this.getData(this.defaultCaseId)
+        this.getBottomData(this.defaultCaseId, 'week')
+      }
     })
   },
   methods: {
@@ -120,6 +125,10 @@ export default {
       'getDashboardData',
       'getDashboardBottomData',
     ]),
+    caseChange () {
+      this.getData(this.postData.caseid)
+      this.getBottomData(this.postData.caseid, 'week')
+    },
     getData (id) {
       this.getDashboardData({
         caseid: id
@@ -141,7 +150,7 @@ export default {
         caseid: id,
         statype: type
       }).then((res) => {
-        // console.log(JSON.stringify(res))
+        console.log(JSON.stringify(res))
       })
     },
   }
@@ -151,9 +160,9 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
 @import "page.scss";
-.listMargin{
+.listMargin {
   margin-left: 20px;
-  &:first-child{
+  &:first-child {
     margin-left: 0;
   }
 }

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

@@ -50,14 +50,14 @@
           <li style="white-space: nowrap;">
             <span>有效期：</span>
             <el-date-picker
-              value-format="yyyy-MM-ddT00:00:00Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
-              value-format="yyyy-MM-ddT23:59:59Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.enddate"
               type="date"
               placeholder="选择截止日期">

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

@@ -33,14 +33,14 @@
           <li style="white-space: nowrap;">
             <span>下单时间：</span>
             <el-date-picker
-              value-format="yyyy-MM-ddT00:00:00Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
-              value-format="yyyy-MM-ddT23:59:59Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.enddate"
               type="date"
               placeholder="选择截止日期">

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

@@ -36,14 +36,14 @@
           <li style="white-space: nowrap;">
             <span>下单时间：</span>
             <el-date-picker
-              value-format="yyyy-MM-ddT00:00:00Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
-              value-format="yyyy-MM-ddT23:59:59Z"
+              value-format="yyyy-MM-dd"
               v-model="postData.enddate"
               type="date"
               placeholder="选择截止日期">

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

@@ -88,7 +88,7 @@
               <div class="flex-item">
                 <div style="width:50%">
                   <el-date-picker
-                    value-format="yyyy-MM-ddT00:00:00Z"
+                    value-format="yyyy-MM-dd"
                     v-model="detail.Month"
                     type="month"
                     placeholder="选择月">

src/pages/system/verificationManager/phoneVerification/index.vue

@@ -20,12 +20,13 @@
       <div class="flex-h">
         <div class="flex-item">
           <div>
-          <el-input
+          <!-- <el-input
             placeholder="请输入手机号"
             v-model="phone"
             @input="phone=phone.replace(/\D/g,'')"
             clearable>
-          </el-input>
+          </el-input> -->
+          <input class="inputBorder" placeholder="请输入手机号" type="text" v-model="phone" @input="phone=phone.replace(/\D/g,'')">
           </div>
         </div>
         <el-button type="danger" @click="toVerificationList">立即核销</el-button>
@@ -81,5 +82,15 @@ export default {
       }
     }
   }
+  .inputBorder{
+    width: 100%;
+    display: block;
+    box-sizing: border-box;
+    border: 1px solid #ccc;
+    line-height: 20px;
+    padding: 10px 0;
+    text-indent: 10px;
+    border-radius: 6px;
+  }
 }
 </style>

src/store/app.js

@@ -54,6 +54,7 @@ export default {
     cases: {
       list: [],
       default: '',
+      belongCase: null,
     },
     roles: [],
     user: {},
@@ -75,7 +76,8 @@ export default {
 
       state.cases = {
         list: data.cases,
-        default: defaultCase
+        default: defaultCase,
+        belongCase: defaultCase,
       }
     },
 

src/util/api.js

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