xcx

config/index.js

@@ -12,11 +12,11 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://192.168.0.62:8080', //wf
+        // target: 'http://192.168.0.62:8080', //wf
         // target: 'http://127.0.0.1:8080', 
         // target: 'http://localhost:8080', //wf
         // target: 'http://192.168.0.11', //ys
-        // target: 'http://192.168.0.125:8080', //hyq
+        target: 'http://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {

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

@@ -91,7 +91,7 @@
               size="mini"
               type="success"
               v-if="scope.row.SendType === 'channel'"
-              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
+              v-clipboard:copy="clientUrl + '/user.html#/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
               v-clipboard:success="onCopy"
               v-clipboard:error="onError"
               >点击复制链接</el-button>

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

@@ -93,7 +93,7 @@
               size="mini"
               type="success"
               v-if="scope.row.SendType === 'channel'"
-              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
+              v-clipboard:copy="clientUrl + '/user.html#/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
               v-clipboard:success="onCopy"
               v-clipboard:error="onError"
               >点击复制链接</el-button>

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

@@ -164,8 +164,9 @@ export default {
           })
           return false
         } else {
-          var reg = /[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$/  // eslint-disable-line
-          if (!reg.test(this.postData.ForwardUrl)) {
+          var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
+          var re = new RegExp(strRegex)
+          if (!re.test(this.postData.ForwardUrl)) {
             this.$message({
               message: '链接地址格式不正确',
               type: 'error',
@@ -198,7 +199,6 @@ export default {
         return false
       }
       this.postData.OrgId = this.OrgId
-      // this.ForwardType === '1' ? this.postData.ForwardType = 'url' : this.postData.ForwardType = 'course'
       this.$ajax(this.$api.cms.addImage.url, {
         method: this.$api.cms.addImage.method,
         data: this.postData

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

@@ -153,8 +153,9 @@ export default {
           })
           return false
         } else {
-          var reg = /[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$/  // eslint-disable-line
-          if (!reg.test(this.postData.ForwardUrl)) {
+         var strRegex = '^((https|http|ftp|rtsp|mms)://)?[a-z0-9A-Z]{3}\.[a-z0-9A-Z][a-z0-9A-Z]{0,61}?[a-z0-9A-Z]\.com|net|cn|cc (:s[0-9]{1-4})?/$'  // eslint-disable-line
+          var re = new RegExp(strRegex)
+          if (!re.test(this.postData.ForwardUrl)) {
             this.$message({
               message: '链接地址格式不正确',
               type: 'error',

src/pages/system/dashboard/index.vue

@@ -47,6 +47,7 @@ import brokenLineGraph from '../../../components/brokenLineGraph/index'
 import ringChart from '../../../components/ringChart/index'
 import dashboard from '../../../components/dashboard/index'
 import brokenLineGraphGroup from '../../../components/brokenLineGraphGroup/index'
+
 const { mapActions: mapStaActions } = createNamespacedHelpers('sta')
 
 export default {
@@ -94,36 +95,46 @@ export default {
     }),
     CaseId: {
       get () {
-        return this.postData.caseid || this.defaultCaseId
+        return this.postData.caseid || this.defaultCaseId || this.cases[0].CaseId
       },
       set (val) {
         this.postData.caseid = val
       }
     }
   },
+  watch: {
+    defaultCaseId: function (val) {
+      if (!this.postData.caseid) {
+        this.postData.caseid = val
+      }
+      this.getData(val)
+      this.getBottomData(val, 'week')
+    },
+  },
   mounted () {
     this.$nextTick(function () {
-      console.log(this.defaultCaseId)
-      console.log(JSON.stringify(this.cases))
-      this.postData.caseid = this.postData.caseid || this.cases[0].CaseId
+    })
+  },
+  methods: {
+    ...mapStaActions([
+      'getDashboardData',
+      'getDashboardBottomData',
+    ]),
+    getData (id) {
       this.getDashboardData({
-        caseid: this.postData.caseid
+        caseid: id
       }).then((res) => {
         console.log(JSON.stringify(res))
       })
+    },
+    getBottomData (id, type) {
       this.getDashboardBottomData({
-        caseid: this.postData.caseid,
-        statype: 'week'
+        caseid: id,
+        statype: type
       }).then((res) => {
         console.log(JSON.stringify(res))
       })
-    })
-  },
-  methods: {
-    ...mapStaActions([
-      'getDashboardData',
-      'getDashboardBottomData',
-    ]),
+    },
   }
 }
 </script>