xcx

config/index.js

@@ -12,8 +12,8 @@ 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.11', //ys
+        // target: 'http://192.168.0.62:8080', //wf
+        target: 'http://192.168.0.11', //ys
         // target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置

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

@@ -85,7 +85,7 @@
             <el-button
               size="mini"
               type="success"
-              v-clipboard:copy="'www.baidu.com' + scope.$index"
+              v-clipboard:copy="this.clientUrl + '/receiveChannelShared/' + scope.row.GymCardId + '/' + scope.row.GymTypeId + '/receive'"
               v-clipboard:success="onCopy"
               v-clipboard:error="onError"
               >点击复制链接</el-button>
@@ -258,6 +258,7 @@ export default {
       gymCardList: x => x.gymCardList,
     }),
     ...mapState({
+      clientUrl: x => x.app.clientUrl,
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),

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

@@ -91,7 +91,7 @@
               size="mini"
               type="success"
               v-if="scope.row.SendType === 'channel'"
-              v-clipboard:copy="'www.baidu.com' + scope.$index"
+              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CardId + '/card/receive'"
               v-clipboard:success="onCopy"
               v-clipboard:error="onError"
               >点击复制链接</el-button>
@@ -265,6 +265,7 @@ export default {
       cardList: x => x.cardList,
     }),
     ...mapState({
+      clientUrl: x => x.app.clientUrl,
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),

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

@@ -92,7 +92,7 @@
               size="mini"
               type="success"
               v-if="scope.row.SendType === 'channel'"
-              v-clipboard:copy="'www.baidu.com' + scope.$index"
+              v-clipboard:copy="clientUrl + '/receiveChannelShared/' + scope.row.CouponId + '/coupon/receive'"
               v-clipboard:success="onCopy"
               v-clipboard:error="onError"
               >点击复制链接</el-button>
@@ -249,6 +249,7 @@ export default {
       customers: x => x.customers,
     }),
     ...mapState({
+      clientUrl: x => x.app.clientUrl,
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),

src/pages/system/dashboard/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="subPage">
     <div class="selectCase">
-      <el-select v-model="CaseId" placeholder="请选择">
+      <el-select v-model="postData.caseid" placeholder="请选择">
         <el-option
           v-for="item in cases"
           :key="item.CaseId"
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import dashboardList from '../../../components/dashboardList/index'
 import histogram from '../../../components/histogram/index'
 import pieDiagram from '../../../components/pieDiagram/index'
@@ -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 {
   name: '',
@@ -102,13 +103,17 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
-      this.drawHistogram()
+      this.getDashboardData({
+        caseid: this.postData.caseid
+      }).then((res) => {
+        console.log(JSON.stringify(res))
+      })
     })
   },
   methods: {
-    drawHistogram () { // 绘制柱状图
-      // this.histogramInit.source(this.histogramParams)
-    },
+    ...mapStaActions([
+      'getDashboardData',
+    ]),
   }
 }
 </script>

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

@@ -171,7 +171,7 @@ export default {
       })
     },
     exportExcel () {
-      window.location.href = `${this.toolClass.ReplaceOrg(this.$api.statistics.cardCouponListExcel.url)}?token=${localStorage.getItem('JWT')}`
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.statistics.cardCouponListExcel.url)}?token=${localStorage.getItem('JWT')}`, '_blank')
     },
   }
 }

src/store/sta/sta.js

@@ -156,5 +156,17 @@ export default {
         }).catch(reject)
       })
     },
+    getDashboardData ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.dashboardData.url, {
+          method: api.statistics.dashboardData.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          resolve(res)
+        }).catch(reject)
+      })
+    },
   }
 }

src/util/api.js

@@ -747,6 +747,10 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/statistics/cardcouponverify/excel`
     },
+    dashboardData: {
+      method: 'get',
+      url: `${baseUrl}${common}/dashboard`
+    },
   }
 }
 export default $api