bug修改

config/index.js

@@ -14,7 +14,7 @@ module.exports = {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://192.168.0.62:8080', //wf
         //target: 'http://127.0.0.1:8080', 
-        target: 'http://192.168.0.62:8080', //wf
+        target: 'http://localhost:8080', //wf
         // target: 'http://192.168.0.11', //ys
         // target: 'http://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp
@@ -33,7 +33,7 @@ module.exports = {
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
 
     // Use Eslint Loader?
-    // If true, your code will be linted during bundling and
+    // If true, your code will be linted during bundling aynd
     // linting errors and warnings will be shown in the console.
     useEslint: true,
     // If true, eslint errors and warnings will also be shown in the error overlay

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

@@ -321,10 +321,16 @@
             <el-table-column
               prop="BeginDate"
               label="开始时间">
+              <template slot-scope="scope">
+                <span>{{toolClass.dateFormat(scope.row.BeginDate, 'yyyy-MM-dd')}}</span>
+              </template>
             </el-table-column>
             <el-table-column
               prop="EndDate"
               label="结束时间">
+              <template slot-scope="scope">
+                <span>{{toolClass.dateFormat(scope.row.EndDate, 'yyyy-MM-dd')}}</span>
+              </template>
             </el-table-column>
             <el-table-column
               prop="CourseType"

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

@@ -49,9 +49,9 @@
           label="有效期"
           width="150">
           <template slot-scope="scope">
-            <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate)}}</span>
+            <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.StartDate, 'yyyy-MM-dd')}}</span>
             <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">至</span>
-            <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate)}}</span>
+            <span v-if="scope.row.StartDate.substr(0, 4) !== '0001'" style="width:100%;display:block;text-align:center;white-space: nowrap;">{{toolClass.dateFormat(scope.row.EndDate, 'yyyy-MM-dd')}}</span>
             <span v-else>-</span>
           </template>
         </el-table-column>

src/pages/system/marketingActivities/addActivities/index.vue

@@ -62,8 +62,8 @@
           </div>
         </li>
         <li style="text-align:center">
-          <el-button type="warning" size="mini" @click="redirection('activitiesList')">返回</el-button>
           <el-button type="primary" size="mini" @click="submitData">提交</el-button>
+          <el-button type="warning" size="mini" @click="redirection('activitiesList')">返回</el-button>
         </li>
       </ul>
     </form>
@@ -153,10 +153,11 @@ export default {
     getCouponList () {
       this.$ajax(this.$api.marketingActivities.getCouponList.url, {
         method: this.$api.marketingActivities.getCouponList.method,
-        queryData: {}
+        urlData: {
+          type: 'system',
+        },
       }).then(res => {
-        // console.log(res)
-        this.giftList = res.list
+        this.giftList = res
         this.giftOptions = this.giftData
       })
     },

src/util/api.js

@@ -707,7 +707,7 @@ const $api = {
     },
     getCouponList: { // 获取赠券卡券类型
       method: 'get',
-      url: `${baseUrl}${common}/coupon`
+      url: `${baseUrl}${common}/coupon/type/:type`
     }
   },
   statistics: {