Bladeren bron

报表预览

zhengjinyi 1 jaar geleden
bovenliggende
commit
c51e773fcd

+ 11 - 0
src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -1115,6 +1115,17 @@ var SupplierApi = {
                 callback(res);
             });
         },
+        // 校验预览码
+        shopCheckPreview: function (params, callback) {
+            Http.AjaxService({
+                url: '/user/shop/checkPreview',
+                type:'get',
+                data:params,
+                json:false,
+            }).then(function (res) {
+                callback(res);
+            });
+        },
         // 供应商主页类别配置列表
         getShopCategory: function (params, callback) {
             Http.AjaxService({

+ 4 - 0
src/main/resources/static/js/supplier-center/encyclopedia/charts-preview.js

@@ -109,6 +109,10 @@ const chartContent = new Vue({
         this.queryParams.marketReportId = getUrlParam("marketReportId") ? getUrlParam("marketReportId") : '';
         this.queryParams.type = getUrlParam("type") ? getUrlParam("type") : 2;
         this.isPreview = getUrlParam("type") !== '1'
+        if(getUrlParam("shareType") === 'share'){
+            this.isShareLogin = true
+            this.shareParams.marketReportId = getUrlParam("marketReportId") ? getUrlParam("marketReportId") : '';
+        }
         // this.openFullScreen2()
     }
 });

+ 12 - 12
src/main/resources/static/js/supplier-center/encyclopedia/mixins/shareLoginMixin.js

@@ -2,21 +2,21 @@ const shareLoginMixin = function () {
     return {
         data() {
             return {
-                isShareLogin:true,
+                isShareLogin:false,
                 isEfficacy:false,
-                form:{
-                    shareCode:'',
-                    shopOrderId:''
+                shareParams:{
+                    code:'',
+                    marketReportId:''
                 },
                 rules: {
-                    shareCode: [{required: true,message: '请输入预览码',trigger: 'blur'}]
+                    code: [{required: true,message: '请输入预览码',trigger: 'blur'}]
                 }
             }
         },
         computed: {
             disabled() {
                 // 分享码长度是否符合要求
-                return this.form.shareCode.trim().length < 4
+                return this.shareParams.code.trim().length < 4
             }
         },
         mounted () {
@@ -27,18 +27,18 @@ const shareLoginMixin = function () {
                 const _self = this;
                 this.$refs[formName].validate(async valid => {
                     if (valid) {
-                        _self.isShareLogin= false
-                        _self.openFullScreen2()
-                        // _self.handleCheckOrderShareCode(_self.form)
+
+                        _self.handleShopCheckPreview(_self.shareParams)
                     }
                 })
             },
             // 订单分享码校验
-            handleCheckOrderShareCode(params){
+            handleShopCheckPreview(params){
                 const _self = this;
-                SupplierApi.checkShopOrderShareCode(params,function (response) {
+                SupplierApi.shopCheckPreview(params,function (response) {
                     if(response.code===0){
-                        window.location.href = '/order-share-details.html?shopOrderId='+response.data
+                        _self.isShareLogin= false
+                        _self.openFullScreen2()
                     }else{
                         _self.$message.error(response.msg)
                     }

+ 1 - 0
src/main/resources/templates/supplier-center/encyclopedia/charts.html

@@ -309,6 +309,7 @@
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/lib/slideVerify.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/echarts.min.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/china.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/echarts-wordcloud.min.js(v=${version})}"></script>

+ 3 - 3
src/main/resources/templates/supplier-center/encyclopedia/components/charts-share-login.html

@@ -1,8 +1,8 @@
 <div class="charts-login">
     <div class="charts-login-form">
-        <el-form ref="dataForm" :rules="rules" :model="form" label-position="top" label-width="0px">
-            <el-form-item label="预览码:" prop="shareCode" :rules="rules.shareCode">
-                <el-input v-model="form.shareCode"  maxlength="4"></el-input>
+        <el-form ref="dataForm" :rules="rules" :model="shareParams" label-position="top" label-width="0px">
+            <el-form-item label="预览码:" prop="code" :rules="rules.code">
+                <el-input v-model="shareParams.code"  maxlength="4"></el-input>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" :disabled="disabled" style="width: 100%;"  @click="handleConfirm('dataForm')">确定</el-button>