文章优化，细节优化，二级页面携带分销关系优化

src/App.vue

@@ -48,6 +48,9 @@ export default {
     // 页面配置信息
     this.getThemePage(extConfig);
 
+    // 商城配置
+    this.shopConfiguration()
+
     setTimeout(() => {
       let mpApp = getApp();
 
@@ -225,6 +228,16 @@ export default {
         }
       });
     },
+    //商城配置
+    shopConfiguration(){
+      shop.get_shop_configuration().then(res=>{
+        if (res.data.code == 200) {
+          let mpApp = getApp();
+          mpApp.shop_configuration = res.data.data
+          console.log(mpApp.shop_configuration,'mpApp.shop_configuration');
+        }
+      })
+    },
     async getThemePage({ mixid, shopid }) {
       await shop
         .themePagesInfo({

src/api/shop.js

@@ -37,5 +37,12 @@ export default {
     return requestPOST(
       `${process.env.OLSHOP_URL}/user/draw_membership_card?cardId=${params}`
     );
+  },
+
+  //获取shop配置
+  get_shop_configuration(){
+    return requestPOST(
+      `${process.env.OLSHOP_URL}/shop/get_shop_configuration`
+    );
   }
 };

src/app.json

@@ -14,7 +14,8 @@
     "pages/tabBar4/main",
     "pages/changeAdr/main",
     "pages/downFile/main",
-    "pages/wxArticle/main"
+    "pages/wxArticle/main",
+    "pages/pages_subpack/article/main"
   ],
   "usingComponents": {},
   "window": {

src/main.js

@@ -11,6 +11,8 @@ import cartApi from './api/cart'
 import classificationApi from "./api/classification";
 import spokesmanApi from './api/spokesman'
 import { DFSImg, concatUrl } from "@/utils/index";
+//一些js工具类
+import tool from "@/utils/tool";
 var log = require('./utils/log')
 import fenxiaoModel from "@/utils/fenxiaoModel";
 import {
@@ -135,6 +137,7 @@ mpApp.getThemePage = getThemePage
 
 mpApp.themeColor = {}
 mpApp.log = log
+mpApp.tool = tool
 
 function getThemePage({mixid,shopid}) {
   shop

src/pages/pages_subpack/article/index.vue

@@ -6,6 +6,7 @@
         <div class="title_user">{{article.author}}</div>
         <div class="title_time">{{article.createDatetime}}</div>
       </div>
+      <!-- <wxParse :content="article.content" v-if="!article.msg" /> -->
       <div v-html="article.content" v-if="!article.msg"></div>
       <!-- <rich-text :datas="datas" v-if="!article.msg"></rich-text> -->
       <div class="title" style="min-height: 50vh;color: #999;align-items: center;display: flex;justify-content: center;" v-else>{{article.msg}}</div>
@@ -52,7 +53,9 @@
 <script>
 import article from '@/api/article'
 import shadeGuide from "./shadeGuide.vue";
-import richText from "../../../components/basicTool/rich-text/index.vue";
+import { throttle, concatUrl } from "../../../utils/index.js"
+// import wxParse from 'mpvue-wxparse'
+
 const app = getApp();
 const { log } = app;
 export default {
@@ -71,59 +74,197 @@ export default {
         pageNum: 0,
         pageSize: 20,
       },
-      datas: {
-        componentData: {}
-      }
     }
   },
   components: {
-    "shade-guide": shadeGuide,
-    "rich-text": richText
+    "shade-guide": shadeGuide
   },
   created() {
   },
   onReady() {
   },
-  onLoad(option) {
+  onLoad(options) {
     wx.showShareMenu({
       withShareTicket: true,
       menus: ['shareAppMessage', 'shareTimeline']
     })
-    this.articleId = option.article_id
-    this.query['articleId'] = this.articleId
-    this.init()
+
+    if (options.queryStr) {
+      wx.showModal({
+        title: "",
+        content: options.queryStr,
+        showCancel: true,
+        cancelText: '取消',
+        cancelColor: '#000000',
+        confirmText: '确定',
+        confirmColor: '#3CC51F',
+        success: (result) => {
+          if (result.confirm) {
+
+          }
+        },
+        fail: () => { },
+        complete: () => { }
+      });
+    } else if (options.article_id) {
+      this.articleId = options.article_id
+      this.query['articleId'] = this.articleId
+      this.init()
+    }
+
+    //进页面存储需要绑定的信息
+    if (options.userId || options.spokesmanRelId) {
+      wx.setStorage({
+        key: "becomeInfo",
+        data: JSON.stringify(options)
+      });
+    }
+
+    if (wx.getStorageSync("sessionid")) {
+      //获取分销信息
+      this.getSpokesmanInit(wx.getStorageSync("becomeInfo") ? JSON.parse(wx.getStorageSync("becomeInfo")) : '')
+    }
+
+
   },
-  onShareAppMessage() {
-    return {
-      title: '',
-      path: `/pages/article/main?article_id=${this.articleId}`
+  // onShareAppMessage() {
+  //   return {
+  //     title: '',
+  //     path: `/pages/pages_subpack/article/main?article_id=${this.articleId}`
+  //   }
+  // },
+  async onShareAppMessage(res) {
+    console.log('wxshare');
+    let newHref = `/pages/pages_subpack/article/main?article_id=${this.articleId}`;
+    let title = app.globalData.shopInfo.shopName;
+    let hasInvitationStatus = 0;
+    if (wx.getStorageSync("sessionid")) {
+      await app.fenxiaoModel.getSpokesmanidByShare().then(data => {
+        hasInvitationStatus = data.hasInvitationStatus;
+      })
+      await app.fenxiaoModel.getSpokesmanInfo().then(data => {
+        let newData = {}
+        if (data != null) {
+          if (hasInvitationStatus == 1) {
+            newData = {
+              spokesmanGroupId: data.groupId,
+              spokesmanShopId: data.shopId,
+              spokesmanRelId: data.id,
+              userId: data.userId
+            }
+          } else {
+            newData = {
+              userId: data.userId
+            }
+          }
+        }
+        newHref = concatUrl(newHref, newData)
+      })
     }
+    console.log(newHref, title, 'share');
+    return {
+      title: title, // 默认是小程序的名称
+      path: newHref, // 默认是当前页面
+      imageUrl: '',
+      success: function (res) {
+        // 转发成功之后的回调
+        if (res.errMsg == "shareAppMessage:ok") {
+          log.info(res, "分享成功");
+        }
+      },
+      fail: function () {
+        // 转发失败之后的回调
+        if (res.errMsg == "shareAppMessage:fail cancel") {
+          // 用户取消转发
+          log.info(res, "分享失败");
+        } else if (res.errMsg == "shareAppMessage:fail") {
+          // 转发失败，其中 detail message 为详细失败信息
+        }
+      },
+      complete: function () {
+        // 转发结束之后的回调（转发成不成功都会执行）
+      }
+    };
   },
-  onShareTimeline() {
+  //用户点击右上角分享朋友圈
+  onShareTimeline: function () {
     return {
       title: '',
-      query: {
-        article_id: this.articleId
-      },
-      imageUrl: '',
-      createDatetime: ''
+      query: `article_id=${this.article_id}`,
+      imageUrl: ''
     }
   },
+  // async onShareTimeline() {
+  //   console.log('Timeline');
+  //   // let newHref = `/pages/pages_subpack/article/main?article_id=${this.articleId}`;
+  //   let newHref = ''
+  //   let title = app.globalData.shopInfo.shopName;
+  //   let hasInvitationStatus = 0;
+  //   if (wx.getStorageSync("sessionid")) {
+  //     await app.fenxiaoModel.getSpokesmanidByShare().then(data => {
+  //       hasInvitationStatus = data.hasInvitationStatus;
+  //     })
+  //     await app.fenxiaoModel.getSpokesmanInfo().then(data => {
+  //       let newData = {}
+  //       if (data != null) {
+  //         if (hasInvitationStatus == 1) {
+  //           newData = {
+  //             spokesmanGroupId: data.groupId,
+  //             spokesmanShopId: data.shopId,
+  //             spokesmanRelId: data.id,
+  //             userId: data.userId
+  //           }
+  //         } else {
+  //           newData = {
+  //             userId: data.userId
+  //           }
+  //         }
+  //       }
+  //       newHref = concatUrl(newHref, newData)
+  //     })
+  //   }
+  //   console.log(newHref, title, 'TimelineShare');
+  //   // let queryStr = `articleId_${this.articleId}/spokesmanGroupId_${obj.spokesmanGroupId}/spokesmanShopId_${obj.spokesmanShopId}/spokesmanRelId_${obj.spokesmanRelId}/userId_${obj.userId}`
+  //   return {
+  //     title: title,
+  //     query: 'a=1111',
+  //     imageUrl: '',
+  //     createDatetime: ''
+  //   }
+  // },
   methods: {
+    getSpokesmanInit(extConfig) {
+      //绑定上下级关系
+      app.fenxiaoModel.becomeRelation(extConfig).then(res => {
+        if (res) {
+          wx.removeStorage({
+            key: "becomeInfo"
+          });
+        }
+      })
+    },
+    //富文本解析和替换
     formatRichText(html) {
-      console.log(html,'html');
       let newContent = html.replace(/<img[^>]*>/gi, function (match, capture) {
-        match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
-        match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-        match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+        if (match.startsWith('<img style="object-fit: contain;')) {
+          console.log(match,'match');
+          match = match.replace(/height:(.*?);/g, 'height: 76px !important;')
+          console.log(match,'match');
+        } else {
+          match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+          match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+          match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+        }
         return match;
       });
+      console.log('newContent', newContent);
       newContent = newContent.replace(/style="[^"]+"/gi, function (match, capture) {
         match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
         return match;
       });
       newContent = newContent.replace(/<br[^>]*\/>/gi, '');
       newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;margin:10px 0;"');
+
       return newContent
     },
     init() {
@@ -131,22 +272,22 @@ export default {
       article.getArticleInfo(this.articleId).then(res => {
         if (res.data.data) {
           let article = res.data.data
-          let content = res.data.data.content.replace("<body>", "").replace("</body>", "")
+          let content = res.data.data.content.replace('<body>', '<div style="overflow-x: hidden;width:100%">').replace("</body>", "</div>")
+          let createDatetime = article.createDatetime != '' ? article.createDatetime.slice(0, -9) : ''
           article.content = this.formatRichText(content)
-          this.datas.componentData['padding'] = 0
-          this.datas.componentData['richText'] = content
-          this.datas.componentData['backgroundColor'] = '#fff'
+          article.createDatetime = createDatetime
           this.article = article
           // this.createDatetime = article.createDatetime != '' ? article.createDatetime.slice(0,-3):''
           // log.info(this.createDatetime,'article.createDatetime');
           if (article.fabulousFlag == 'true') {
             this.isThumbsUp = true;
           }
-          if (article.title && article.title.length) {
-            wx.setNavigationBarTitle({
-              title: article.title
-            })
-          }
+          // 不设置title
+          // if (article.title && article.title.length) {
+          //   wx.setNavigationBarTitle({
+          //     title: article.title
+          //   })
+          // }
         }
       });
 
@@ -267,6 +408,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// @import url("~mpvue-wxparse/src/wxParse.css");
+.imgbox .img {
+  height: 96px !important;
+}
 .article_container {
   position: relative;
 }
@@ -276,6 +421,7 @@ export default {
   padding: 0 10px;
   padding-bottom: 100px;
   box-sizing: border-box;
+  overflow-x: hidden;
 }
 
 .title {
@@ -284,13 +430,14 @@ export default {
   width: 100%;
   padding: 12px 0;
   text-align: left;
+  font-weight: 700;
 }
 .title_info {
   display: flex;
-  justify-content: center;
+  justify-content: flex-start;
   // padding: 0 12px;
   font-size: 13px;
-  margin-bottom: 12px;
+  margin-bottom: 24px;
 }
 .title_user {
   width: 100%;
@@ -299,7 +446,7 @@ export default {
 .title_time {
   width: 100%;
   // padding-right: 13px;
-  text-align: right;
+  text-align: left;
   color: #999;
 }
 

src/pages/pages_subpack/article/main.json

 {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "文章详情",
+    "navigationBarTitleText": "",
     "navigationBarTextStyle": "black",
     "usingComponents": {
         

src/pages/tabBar1/index.vue

@@ -4,9 +4,149 @@
 
 <script>
 import tabbarPage from "../../components/tabbarPage.vue";
+
+
+import { concatUrl } from "../../utils/index.js"
+const app = getApp();
+const { log } = app;
 export default {
   components: {
     tabbarPage,
   },
+  data() {
+    return {
+      pageInfo: {},
+      pageData: {},
+    }
+  },
+  onLoad(options) {
+    wx.showShareMenu({
+      withShareTicket: true,
+      menus: ['shareAppMessage', 'shareTimeline']
+    })
+
+    wx.showModal({
+      title: '',
+      content: JSON.stringify(options),
+      showCancel: true,
+      cancelText: '取消',
+      cancelColor: '#000000',
+      confirmText: '确定',
+      confirmColor: '#3CC51F',
+      success: (result) => {
+        if(result.confirm){
+          
+        }
+      },
+      fail: ()=>{},
+      complete: ()=>{}
+    });
+    console.log(this.mpApp.globalData.pageList, 'llll');
+
+    this.init()
+
+    if (options.userId || options.spokesmanRelId) {
+      wx.setStorage({
+        key: "becomeInfo",
+        data: JSON.stringify(options)
+      });
+    }
+
+    if (wx.getStorageSync("sessionid")) {
+      //获取个人名片入口
+      app.fenxiaoModel.getHomePageQuickAccess().then(res => {
+        that.showMyCard = res;
+      })
+      //获取分销信息
+      this.getSpokesmanInit(wx.getStorageSync("becomeInfo") ? JSON.parse(wx.getStorageSync("becomeInfo")) : '')
+    }
+  },
+  async onShareAppMessage(res) {
+    log.info(res)
+    let newHref = '/pages/tabBar1/main';
+    let title = app.globalData.shopInfo.shopName;
+    let hasInvitationStatus = 0;
+    if (wx.getStorageSync("sessionid")) {
+      await app.fenxiaoModel.getSpokesmanidByShare().then(data => {
+        hasInvitationStatus = data.hasInvitationStatus;
+      })
+      await app.fenxiaoModel.getSpokesmanInfo().then(data => {
+        let newData = {}
+        if (data != null) {
+          if (hasInvitationStatus == 1) {
+            newData = {
+              spokesmanGroupId: data.groupId,
+              spokesmanShopId: data.shopId,
+              spokesmanRelId: data.id,
+              userId: data.userId
+            }
+          } else {
+            newData = {
+              userId: data.userId
+            }
+          }
+        }
+        newHref = concatUrl(newHref, newData)
+      })
+    }
+    let imageUrl = '';
+    //多主题自定义分享标题和图片
+    if (this.pageInfo.pageSettingData && JSON.parse(this.pageInfo.pageSettingData).shareTitle) {
+      title = JSON.parse(this.pageInfo.pageSettingData).shareTitle
+    }
+    if (this.pageInfo.pageSettingData && JSON.parse(this.pageInfo.pageSettingData).shareImg) {
+      imageUrl = JSON.parse(this.pageInfo.pageSettingData).shareImg
+    }
+    log.info(newHref, 3333555666, title, res)
+    return {
+      title: title, // 默认是小程序的名称
+      path: newHref, // 默认是当前页面
+      imageUrl: imageUrl,
+      success: function (res) {
+        // 转发成功之后的回调
+        if (res.errMsg == "shareAppMessage:ok") {
+          log.info(res, "分享成功");
+        }
+      },
+      fail: function () {
+        // 转发失败之后的回调
+        if (res.errMsg == "shareAppMessage:fail cancel") {
+          // 用户取消转发
+          log.info(res, "分享失败");
+        } else if (res.errMsg == "shareAppMessage:fail") {
+          // 转发失败，其中 detail message 为详细失败信息
+        }
+      },
+      complete: function () {
+        // 转发结束之后的回调（转发成不成功都会执行）
+      }
+    };
+  },
+  onShareTimeline(res) {
+    log.info(res, '-----onShareTimeline')
+  },
+  methods: {
+    init() {
+      this.setVisible(this.mpApp.globalData.pageList, (res) => {
+        this.pageInfo = res;
+        this.pageData = JSON.parse(this.pageInfo.pageData);
+      });
+    },
+    async setVisible(pageList, cb) {
+      // 首页显示条件
+      let pageInfo = pageList.filter((item) => item.pageCode == 1)[0];
+      cb(pageInfo)
+    },
+    getSpokesmanInit(extConfig) {
+      //绑定上下级关系
+      app.fenxiaoModel.becomeRelation(extConfig).then(res => {
+        if (res) {
+          wx.removeStorage({
+            key: "becomeInfo"
+          });
+        }
+      })
+    },
+  }
 };
 </script>

src/utils/themeModule.js

-!function i(o,a,r){function l(t,e){if(!a[t]){if(!o[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(s)return s(t,!0);throw(n=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",n}n=a[t]={exports:{}},o[t][0].call(n.exports,function(e){return l(o[t][1][e]||e)},n,n.exports,i,o,a,r)}return a[t].exports}for(var s="function"==typeof require&&require,e=0;e<r.length;e++)l(r[e]);return l}({1:[function(e,t,n){var i,o,t=t.exports={};function a(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function l(t){if(i===setTimeout)return setTimeout(t,0);if((i===a||!i)&&setTimeout)return i=setTimeout,setTimeout(t,0);try{return i(t,0)}catch(e){try{return i.call(null,t,0)}catch(e){return i.call(this,t,0)}}}!function(){try{i="function"==typeof setTimeout?setTimeout:a}catch(e){i=a}try{o="function"==typeof clearTimeout?clearTimeout:r}catch(e){o=r}}();var s,c=[],u=!1,p=-1;function g(){u&&s&&(u=!1,s.length?c=s.concat(c):p=-1,c.length&&d())}function d(){if(!u){var e=l(g);u=!0;for(var t=c.length;t;){for(s=c,c=[];++p<t;)s&&s[p].run();p=-1,t=c.length}s=null,u=!1,function(t){if(o===clearTimeout)return clearTimeout(t);if((o===r||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(t);try{o(t)}catch(e){try{return o.call(null,t)}catch(e){return o.call(this,t)}}}(e)}}function m(e,t){this.fun=e,this.array=t}function h(){}t.nextTick=function(e){var t=new Array(arguments.length-1);if(1<arguments.length)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];c.push(new m(e,t)),1!==c.length||u||l(d)},m.prototype.run=function(){this.fun.apply(null,this.array)},t.title="browser",t.browser=!0,t.env={},t.argv=[],t.version="",t.versions={},t.on=h,t.addListener=h,t.once=h,t.off=h,t.removeListener=h,t.removeAllListeners=h,t.emit=h,t.prependListener=h,t.prependOnceListener=h,t.listeners=function(e){return[]},t.binding=function(e){throw new Error("process.binding is not supported")},t.cwd=function(){return"/"},t.chdir=function(e){throw new Error("process.chdir is not supported")},t.umask=function(){return 0}},{}],2:[function(e,t,a){!function(o,t){!function(){"use strict";Object.defineProperty(a,"__esModule",{value:!0}),a.hylBannerLink=i,a.hylToLink=s;var r=void 0,m=void 0,h=void 0,f=void 0,v=void 0,l=void 0,k="",n=null;function i(e){var t,n,i,o,a,r,l,s,c,u,p,g,d;k=$nuxt.$store,console.log("hylBannerLink",e),3!=e.type?1.1==e.type&&(1==k.state.miniProgram||2==k.state.miniProgram?-1<e.link.indexOf("pages/hiberDrawEntity/hiberDrawEntity")?(t=e.link.split("?"))[1]&&t[1].split("=")[1]&&(l=JSON.parse(decodeURIComponent(t[1].split("=")[1])),c=(s=l).id,u=l.type,p=l.isOpenDraw,g=v.formatDate.format(new Date),d=(d=l.validTimeEnd).split(".").join("-"),2==l.validTimeEnd.split(" ").length||(g=g.split(" ")[0]),g=(g=new Date(d.replace(/-/g,"/")).getTime()-new Date(g.replace(/-/g,"/")).getTime())/1e3,2==p?0<=g?(1==u&&$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}),2==u&&$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}),3==u&&$mp.miniProgram.navigateTo({url:"/pages/draw/turntable/turntable?id="+c})):2==u&&null!=s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?perdraw=33&id="+c}):2==u&&null==s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}):m.alert({title:"标题",message:"抽奖已结束"}).then(function(){}):1==u?null==s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}):$mp.miniProgram.navigateTo({url:"/pages/draw/openDraw/openDraw?id="+c}):2==u?null!=s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/openDraw/openDraw?id="+c}):$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}):null==s.drawRecordEntity?m.alert({title:"标题",message:"抽奖已结束"}).then(function(){}):$mp.miniProgram.navigateTo({url:"/pages/draw/openDraw/openDraw?id="+c})):-1<e.link.indexOf("type")?(t=e.link.split("?"),"[object Array]"==Object.prototype.toString.call(t)&&t.length&&(r=t[1].split("&"),n={},r.forEach(function(e){e.split("="),n[e.split("=")[0]]=e.split("=")[1]}),console.log(n),i=n.id,o=n.jumpScore,a=n.type,k.state.sessionId?f.getConsumerScoreFlag({outId:k.state.userInfo.mixId,advertisementId:i}).then(function(e){0==e.code&&(1==e.object?(o&&0<o&&f.changeScore({outId:k.state.userInfo.mixId,advertisementId:i}).then(function(e){e.object&&$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i})}),o&&o<0&&w.showModal({title:"提示",content:"跳转扣除"+Math.abs(o)+"积分",success:function(e){e.confirm?f.changeScore({outId:k.state.userInfo.mixId,advertisementId:i}).then(function(e){e.object&&$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i})}):e.cancel&&console.log("用户点击取消")}}),o||$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i})):$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i}))}):$mp.miniProgram.navigateTo({url:"/pages/login/login"}))):((e.link.includes("pages/draw/draw/draw")||e.link.includes("pages/question/question")||e.link.includes("pages/live/live"))&&(r=y($nuxt.$route.query.mixid+"_location")&&JSON.parse(y($nuxt.$route.query.mixid+"_location")).outId,console.log(r,"跳转id"),r&&(e.link.includes("?")?e.link=e.link+"&addressId="+r:e.link=e.link+"?addressId="+r)),$mp.miniProgram.navigateTo({url:e.link})):h("暂不支持")):1==k.state.miniProgram||2==k.state.miniProgram?$mp.miniProgram.navigateTo({url:"/pages/toMini/toMini?weappPage="+encodeURIComponent(e.link)+"&weappAppId="+e.name}):h("暂不支持")}function s(e){if(e=e.data,console.log("----工具中hyl"),n=e.type,(k=$nuxt.$store).getters["sceneModule/flushbonadingVisible"])if(null!=n&&"undefined"!=n){if(0!=n)if(1==n)"/"==e.link.substring(0,1)?$nuxt.$router.push(e.link):!e.link.startsWith("http")&&!e.link.startsWith("https")||1!=k.state.miniProgram&&2!=k.state.miniProgram?window.location.href=e.link:$mp.miniProgram.navigateTo({url:"/pages/wxArticle/main?link="+encodeURIComponent(e.link)});else if(2==n){var t=e.feature.type;"themeCouponClick"==t||0==t?this.$themeCouponClick(e.feature.value.couponCode,e.feature.value):1==t?(console.log("是分享了。。。。"),2==e.type&&1==e.feature.type&&$nuxt.$SHARE({itemList:e.feature.value})):"themeMemberCardClick"!=t&&2!=t||this.$themeMemberCardClick(e.feature.value)}else if(1.1==n||3==n)i(e);else if(1.2==n){if("outerChain:businessCenter"==e.link)return console.log(l.GUIDE_URL,"-----shopConfig.GUIDE_URL"),t=l.GUIDE_URL+"/login?mixid="+$nuxt.$route.query.mixid+"&back="+encodeURIComponent(window.location.href),void(window.location.href=t);"/"==e.link.substring(0,1)?$nuxt.$router.push(e.link):1==k.state.miniProgram||2==k.state.miniProgram?$mp.miniProgram.navigateTo({url:"/pages/wxArticle/main?link="+encodeURIComponent(e.link)}):window.location.href=e.link}else 0<e.length&&$nuxt.$router.push(e.link)}else 0<e.length&&$nuxt.$router.push(e)}function y(e){if(o.browser&&"undefined"!=typeof document)for(var t=document.cookie.split(";"),n=0;n<t.length;n++){var i=t[n].split("=");if(i[0].trim()==e)return decodeURIComponent(i[1])}}Object.defineProperty(a,"__esModule",{value:!0}),a.themeToLinkInit=e,a.$themeToLink=R;var c=null,u=null,p=null,r=void 0,g=void 0,l=void 0,h=void 0,s=void 0,d=void 0,w=void 0,C=void 0;function T(e,t){t=1<arguments.length&&void 0!==t?t:"";return"../index/main?from=themeLink&backpath="+encodeURIComponent(e)+"&params="+encodeURIComponent(t)}function P(){return 1==c?this.$store&&this.$store.state.sessionId&&this.$store.state.sessionId:2==c?w&&w.getStorageSync("sessionid"):void 0}function $(){return 1==c&&this.$store&&this.$store.state.miniProgram}function b(){return 1==c?l.GUIDE_URL:2==c?config.GUIDE_URL:void 0}function I(e){return e.link.split("?")[0]}function x(e){var e=e.link.split("?"),n=[];return e.forEach(function(e,t){1<=t&&n.push(e)}),n.join("?")||""}function D(t){var e=getApp();return e.globalData.footerVal?e.globalData.footerVal.componentData.list.findIndex(function(e){return I(e.link)==t.split("?")[0]}):-1}var L=["index","media-video","goods-goodsInfo","goods-commodityMenu","goodsSearch-goodsSearch","chooseStores","activty-receivingGift","activty","login-register","login-phoneLogin","login-authInformation","login-forgetPassWord","login-accountLogin","login-wxRegister","pay-payList","comment-evaluateList","goods-commonProblemList","article-articlePage","article-articleList","goods-posters","liveBroadcast","liveBroadcast-list","personalCenter-coupon-getCoupon","buyerShow-showDetail","goods-addGoodsList","personalCenter-CDkey-exchange","giftCards-linkReceive","giftCoupon-preview","smartForm","shopCart-shareShopCart","groupBuying-beInvite","brandTopics","personalCenter-spokesmanCenter","personalCenter-spokesmanCenter-mine-spokesmanHomePage","liveBroadcast-lived","personalCenter-spokesmanCenter-mine-getBusinessCard","changeAdr"].map(function(e){return"/index"==(e="/"+e.replace(/-/g,"/"))?"/":e});function e(e){var t=e.homeNative,n=e.wx,i=e.getCoupon,o=e.themeMemberCardClick,a=e.requireFun,e=e.extend;if(C=e,c=t,d=a,console.log(d,"-------------------------115"),g=d.createdUserJWT,d.getBcakUrl,w=n,console.log(c,"-------------themeToLinkInit"),console.log("toPage-------------"),p=1==c?function(e){var t=e.pagePath;1==(e=void 0===(e=e.pageType)?1:e)?this.$router.push(t):2==e?window.location.href=t:3==e&&w.navigateTo({url:t})}:2==c?function(e){var t=e.pagePath;1==(e=void 0===(e=e.pageType)?1:e)?(console.log("pagePath",t),w.navigateTo({url:t})):2==e&&w.reLaunch({url:t})}:void 0,1==c)try{r=d.Vue,l=d.shopConfig,r.prototype.$themeToLink=R,h=d.Toast,s=d.hylToLink}catch(e){}else 2==c&&((u=getApp()).$themeToLink=R,u.getCoupon=i,u.themeMemberCardClick=o)}function U(e){if(!(e=e.split("?")[1]))return{};for(var t,n,i=e.split("&"),o={},a=0;a<i.length;a++)t=(n=i[a].split("="))[0],n=n[1],console.log(81,this),o[t]=n;return o}async function R(t){if(console.log(t,"$themeToLink"),console.log(C,"extend======="),console.log("data",t),C.loginIntercept&&!P.call(this)){console.log("走进来了");var e="/pages/login/main?back="+I(t)+"&params="+JSON.stringify(U(t.link));return p({pagePath:e}),!1}if(t.type&&t.link&&t.link.includes("dynamicForm")){if(!P.call(this)){console.log("走进来了--dynamicForm");var n="/pages/login/main?back="+I(t)+"&params="+JSON.stringify(U(t.link));return p({pagePath:n}),!1}await g().then(function(e){t.link+="&token="+e}).catch(function(e){})}var i,o,a,r;1==c&&this.$store.getters["sceneModule/flushbonadingVisible"]?s.call(this,{data:t,Vue:d.Vue,Dialog:d.Dialog,Toast:d.Toast,hyl:d.hyl,dateFilter:d.dateFilter,shopConfig:d.shopConfig}):(e=t.type,console.log(t.key,"----------------------key"),(2==e||2!=c||t.key&&t.key.startsWith("1.9")||t.link&&t.link.startsWith("/activty/")||t.link.startsWith("/article/")||function(e){var t=I(e),n=x(e);if(console.log("parseLink",t),console.log("parseQuery",n),console.log("noLoginListPath",L),L.includes(t)||"/goods/"==t.substr(0,7)||t.includes("/brandTopics")||P.call(this))return!(0<=(i=D(t)))||(i=0==i?D("/"):i,t="/"==t?"/pages/home/main":"/pages/tabBar"+i+"/main",(i=getCurrentPages())[i.length-1].route!=t&&(p({pagePath:t+(n?"?"+n:""),pageType:2}),0));var i="",i=-1<n.indexOf("scene=sso")?"/pages/login/main?back="+t+"&ossLink="+encodeURIComponent(n):"/pages/login/main?back="+t+"&params="+JSON.stringify(U(e.link));return console.log(i,"------------------------190"),p({pagePath:i}),0}(t))&&(null!=e&&"undefined"!=e?0==e||(1==e?"/"==t.link.substring(0,1)?1==c?p.call(this,{pagePath:t.link}):2==c&&(i="",i=t.link&&t.link.startsWith("/article/")?"/pages/pages_subpack/article/main?article_id="+(n=t.link.split("/"))[n.length-1]:T(I(t),x(t)),console.log("url",i),p({pagePath:i})):t.link.startsWith("http")||t.link.startsWith("https")?1==c?p.call(this,{pagePath:t.link,pageType:2}):(i="/pages/wxArticle/main?link="+encodeURIComponent(t.link),p({pagePath:i})):p({pagePath:t.link,pageType:2}):1.1==e?2==c?p({pagePath:t.link}):1==c&&(1==$.call(this)||2==$.call(this)?p.call(this,{pagePath:t.link,pageType:3}):h("暂不支持")):1.2==e?"outerChain:businessCenter"!=t.link?"/"==t.link.substring(0,1)?p.call(this,{pagePath:t.link}):1==c?1==this.$store.state.miniProgram||2==this.$store.state.miniProgram?(o="/pages/wxArticle/main?link="+encodeURIComponent(t.link),p.call(this,{pagePath:o,pageType:3})):p.call(this,{pagePath:t.link,pageType:2}):2==c&&(o="/pages/wxArticle/main?link="+encodeURIComponent(t.link),p.call(this,{pagePath:o,pageType:1})):(console.log(b(),"-----getGUIDE_URL()"),a=b()+"/login?mixid="+this.$nuxt.$route.query.mixid+"&back="+encodeURIComponent(window.location.href),p.call(this,{pagePath:a,pageType:2})):2==e?"themeCouponClick"==(a=t.feature.type)||0==a?1==c?this.$themeCouponClick(t.feature.value.couponCode,t.feature.value):2==c&&u.getCoupon(t.feature.value.couponCode,t.feature.value):1==a?2==t.type&&1==t.feature.type&&function(e){1==c?this.$nuxt.$SHARE({itemList:e.feature.value}):2==c&&u.shareInit({itemList:e.feature.value})}.call(this,t):"themeMemberCardClick"!=a&&2!=a||(1==c?this.$themeMemberCardClick(t.feature.value):2==c&&u.themeMemberCardClick(t.feature.value)):3==e?(console.log(c,"-----------------homeNative"),1==c?1==$.call(this)||2==$.call(this)?(e=this.$store.getters["sceneModule/flushbonadingVisible"]?"/pages/toMini/toMini?weappPage="+encodeURIComponent(t.link)+"&weappAppId="+t.name:"/pages/toMini/main?weappPage="+encodeURIComponent(t.link)+"&weappAppId="+t.name,p.call(this,{pagePath:e,pageType:3})):h("暂不支持"):t.key&&t.key.startsWith("1.9")?function(e){if(console.log("sss",e),2==c)switch(e.key){case"1.9.1":console.log("begin"),w.openChannelsActivity?w.openChannelsActivity({finderUserName:e.name,feedId:e.link,success:function(){console.log("success")},fail:function(){console.log("fail"),E.call(this,"提示","打开视频号失败")}}):E.call(this),console.log("end");break;case"1.9.2":console.log("begin"),w.openChannelsEvent?w.openChannelsEvent({finderUserName:e.name,eventId:e.link,fail:function(){E.call(this,"提示","打开视频号活动失败")}}):E.call(this),console.log("end")}}.call(this,t):(r="/pages/toMini/main?weappPage="+encodeURIComponent(t.link)+"&weappAppId="+t.name,p({pagePath:r}))):0<t.length&&p.call(this,{pagePath:t.link})):0<t.length&&(1==c?p.call(this,{pagePath:t}):2==c&&(r=T(I(t),x(t)),p({pagePath:r})))))}function E(){w.showModal({title:0<arguments.length&&void 0!==arguments[0]?arguments[0]:"提示",content:1<arguments.length&&void 0!==arguments[1]?arguments[1]:"当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。"}),console.log("不支持")}t.themeToLinkInit=e}.call(this)}.call(this,e("_process"),"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{_process:1}]},{},[2]);
\ No newline at end of file
+!function i(o,a,r){function l(t,e){if(!a[t]){if(!o[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(s)return s(t,!0);throw(n=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",n}n=a[t]={exports:{}},o[t][0].call(n.exports,function(e){return l(o[t][1][e]||e)},n,n.exports,i,o,a,r)}return a[t].exports}for(var s="function"==typeof require&&require,e=0;e<r.length;e++)l(r[e]);return l}({1:[function(e,t,n){var i,o,t=t.exports={};function a(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function l(t){if(i===setTimeout)return setTimeout(t,0);if((i===a||!i)&&setTimeout)return i=setTimeout,setTimeout(t,0);try{return i(t,0)}catch(e){try{return i.call(null,t,0)}catch(e){return i.call(this,t,0)}}}!function(){try{i="function"==typeof setTimeout?setTimeout:a}catch(e){i=a}try{o="function"==typeof clearTimeout?clearTimeout:r}catch(e){o=r}}();var s,c=[],u=!1,p=-1;function g(){u&&s&&(u=!1,s.length?c=s.concat(c):p=-1,c.length&&d())}function d(){if(!u){var e=l(g);u=!0;for(var t=c.length;t;){for(s=c,c=[];++p<t;)s&&s[p].run();p=-1,t=c.length}s=null,u=!1,function(t){if(o===clearTimeout)return clearTimeout(t);if((o===r||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(t);try{o(t)}catch(e){try{return o.call(null,t)}catch(e){return o.call(this,t)}}}(e)}}function m(e,t){this.fun=e,this.array=t}function h(){}t.nextTick=function(e){var t=new Array(arguments.length-1);if(1<arguments.length)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];c.push(new m(e,t)),1!==c.length||u||l(d)},m.prototype.run=function(){this.fun.apply(null,this.array)},t.title="browser",t.browser=!0,t.env={},t.argv=[],t.version="",t.versions={},t.on=h,t.addListener=h,t.once=h,t.off=h,t.removeListener=h,t.removeAllListeners=h,t.emit=h,t.prependListener=h,t.prependOnceListener=h,t.listeners=function(e){return[]},t.binding=function(e){throw new Error("process.binding is not supported")},t.cwd=function(){return"/"},t.chdir=function(e){throw new Error("process.chdir is not supported")},t.umask=function(){return 0}},{}],2:[function(e,t,a){!function(o,t){!function(){"use strict";Object.defineProperty(a,"__esModule",{value:!0}),a.hylBannerLink=i,a.hylToLink=s;var r=void 0,m=void 0,h=void 0,f=void 0,v=void 0,l=void 0,k="",n=null;function i(e){var t,n,i,o,a,r,l,s,c,u,p,g,d;k=$nuxt.$store,console.log("hylBannerLink",e),3!=e.type?1.1==e.type&&(1==k.state.miniProgram||2==k.state.miniProgram?-1<e.link.indexOf("pages/hiberDrawEntity/hiberDrawEntity")?(t=e.link.split("?"))[1]&&t[1].split("=")[1]&&(l=JSON.parse(decodeURIComponent(t[1].split("=")[1])),c=(s=l).id,u=l.type,p=l.isOpenDraw,g=v.formatDate.format(new Date),d=(d=l.validTimeEnd).split(".").join("-"),2==l.validTimeEnd.split(" ").length||(g=g.split(" ")[0]),g=(g=new Date(d.replace(/-/g,"/")).getTime()-new Date(g.replace(/-/g,"/")).getTime())/1e3,2==p?0<=g?(1==u&&$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}),2==u&&$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}),3==u&&$mp.miniProgram.navigateTo({url:"/pages/draw/turntable/turntable?id="+c})):2==u&&null!=s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?perdraw=33&id="+c}):2==u&&null==s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}):m.alert({title:"标题",message:"抽奖已结束"}).then(function(){}):1==u?null==s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}):$mp.miniProgram.navigateTo({url:"/pages/draw/openDraw/openDraw?id="+c}):2==u?null!=s.drawRecordEntity?$mp.miniProgram.navigateTo({url:"/pages/draw/openDraw/openDraw?id="+c}):$mp.miniProgram.navigateTo({url:"/pages/draw/drawDetails/drawDetails?id="+c}):null==s.drawRecordEntity?m.alert({title:"标题",message:"抽奖已结束"}).then(function(){}):$mp.miniProgram.navigateTo({url:"/pages/draw/openDraw/openDraw?id="+c})):-1<e.link.indexOf("type")?(t=e.link.split("?"),"[object Array]"==Object.prototype.toString.call(t)&&t.length&&(r=t[1].split("&"),n={},r.forEach(function(e){e.split("="),n[e.split("=")[0]]=e.split("=")[1]}),console.log(n),i=n.id,o=n.jumpScore,a=n.type,k.state.sessionId?f.getConsumerScoreFlag({outId:k.state.userInfo.mixId,advertisementId:i}).then(function(e){0==e.code&&(1==e.object?(o&&0<o&&f.changeScore({outId:k.state.userInfo.mixId,advertisementId:i}).then(function(e){e.object&&$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i})}),o&&o<0&&y.showModal({title:"提示",content:"跳转扣除"+Math.abs(o)+"积分",success:function(e){e.confirm?f.changeScore({outId:k.state.userInfo.mixId,advertisementId:i}).then(function(e){e.object&&$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i})}):e.cancel&&console.log("用户点击取消")}}),o||$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i})):$mp.miniProgram.navigateTo({url:"/pages/advertisement/advertisement?type="+a+"&id="+i}))}):$mp.miniProgram.navigateTo({url:"/pages/login/login"}))):((e.link.includes("pages/draw/draw/draw")||e.link.includes("pages/question/question")||e.link.includes("pages/live/live"))&&(r=w($nuxt.$route.query.mixid+"_location")&&JSON.parse(w($nuxt.$route.query.mixid+"_location")).outId,console.log(r,"跳转id"),r&&(e.link.includes("?")?e.link=e.link+"&addressId="+r:e.link=e.link+"?addressId="+r)),$mp.miniProgram.navigateTo({url:e.link})):h("暂不支持")):1==k.state.miniProgram||2==k.state.miniProgram?$mp.miniProgram.navigateTo({url:"/pages/toMini/toMini?weappPage="+encodeURIComponent(e.link)+"&weappAppId="+e.name}):h("暂不支持")}function s(e){if(e=e.data,console.log("----工具中hyl"),n=e.type,(k=$nuxt.$store).getters["sceneModule/flushbonadingVisible"])if(null!=n&&"undefined"!=n){if(0!=n)if(1==n)"/"==e.link.substring(0,1)?$nuxt.$router.push(e.link):!e.link.startsWith("http")&&!e.link.startsWith("https")||1!=k.state.miniProgram&&2!=k.state.miniProgram?window.location.href=e.link:$mp.miniProgram.navigateTo({url:"/pages/wxArticle/main?link="+encodeURIComponent(e.link)});else if(2==n){var t=e.feature.type;"themeCouponClick"==t||0==t?this.$themeCouponClick(e.feature.value.couponCode,e.feature.value):1==t?(console.log("是分享了。。。。"),2==e.type&&1==e.feature.type&&$nuxt.$SHARE({itemList:e.feature.value})):"themeMemberCardClick"!=t&&2!=t||this.$themeMemberCardClick(e.feature.value)}else if(1.1==n||3==n)i(e);else if(1.2==n){if("outerChain:businessCenter"==e.link)return console.log(l.GUIDE_URL,"-----shopConfig.GUIDE_URL"),t=l.GUIDE_URL+"/login?mixid="+$nuxt.$route.query.mixid+"&back="+encodeURIComponent(window.location.href),void(window.location.href=t);"/"==e.link.substring(0,1)?$nuxt.$router.push(e.link):1==k.state.miniProgram||2==k.state.miniProgram?$mp.miniProgram.navigateTo({url:"/pages/wxArticle/main?link="+encodeURIComponent(e.link)}):window.location.href=e.link}else 0<e.length&&$nuxt.$router.push(e.link)}else 0<e.length&&$nuxt.$router.push(e)}function w(e){if(o.browser&&"undefined"!=typeof document)for(var t=document.cookie.split(";"),n=0;n<t.length;n++){var i=t[n].split("=");if(i[0].trim()==e)return decodeURIComponent(i[1])}}Object.defineProperty(a,"__esModule",{value:!0}),a.themeToLinkInit=e,a.$themeToLink=R;var c=null,u=null,p=null,r=void 0,g=void 0,l=void 0,h=void 0,s=void 0,d=void 0,y=void 0,C=void 0;function T(e,t){t=1<arguments.length&&void 0!==t?t:"";return"../index/main?from=themeLink&backpath="+encodeURIComponent(e)+"&params="+encodeURIComponent(t)}function P(){return 1==c?this.$store&&this.$store.state.sessionId&&this.$store.state.sessionId:2==c?y&&y.getStorageSync("sessionid"):void 0}function $(){return 1==c&&this.$store&&this.$store.state.miniProgram}function b(){return 1==c?l.GUIDE_URL:2==c?config.GUIDE_URL:void 0}function I(e){return e.link.split("?")[0]}function x(e){var e=e.link.split("?"),n=[];return e.forEach(function(e,t){1<=t&&n.push(e)}),n.join("?")||""}function D(t){var e=getApp();return e.globalData.footerVal?e.globalData.footerVal.componentData.list.findIndex(function(e){return I(e.link)==t.split("?")[0]}):-1}var L=["index","media-video","goods-goodsInfo","goods-commodityMenu","goodsSearch-goodsSearch","chooseStores","activty-receivingGift","activty","login-register","login-phoneLogin","login-authInformation","login-forgetPassWord","login-accountLogin","login-wxRegister","pay-payList","comment-evaluateList","goods-commonProblemList","article-articlePage","article-articleList","goods-posters","liveBroadcast","liveBroadcast-list","personalCenter-coupon-getCoupon","buyerShow-showDetail","goods-addGoodsList","personalCenter-CDkey-exchange","giftCards-linkReceive","giftCoupon-preview","smartForm","shopCart-shareShopCart","groupBuying-beInvite","brandTopics","personalCenter-spokesmanCenter","personalCenter-spokesmanCenter-mine-spokesmanHomePage","liveBroadcast-lived","personalCenter-spokesmanCenter-mine-getBusinessCard","changeAdr"].map(function(e){return"/index"==(e="/"+e.replace(/-/g,"/"))?"/":e});function e(e){var t=e.homeNative,n=e.wx,i=e.getCoupon,o=e.themeMemberCardClick,a=e.requireFun,e=e.extend;if(C=e,c=t,d=a,console.log(d,"-------------------------115"),g=d.createdUserJWT,d.getBcakUrl,y=n,console.log(c,"-------------themeToLinkInit"),console.log("toPage-------------"),p=1==c?function(e){var t=e.pagePath;1==(e=void 0===(e=e.pageType)?1:e)?this.$router.push(t):2==e?window.location.href=t:3==e&&y.navigateTo({url:t})}:2==c?function(e){var t=e.pagePath;1==(e=void 0===(e=e.pageType)?1:e)?(console.log("pagePath",t),y.navigateTo({url:t})):2==e&&y.reLaunch({url:t})}:void 0,1==c)try{r=d.Vue,l=d.shopConfig,r.prototype.$themeToLink=R,h=d.Toast,s=d.hylToLink}catch(e){}else 2==c&&((u=getApp()).$themeToLink=R,u.getCoupon=i,u.themeMemberCardClick=o)}function U(e){if(!(e=e.split("?")[1]))return{};for(var t,n,i=e.split("&"),o={},a=0;a<i.length;a++)t=(n=i[a].split("="))[0],n=n[1],console.log(81,this),o[t]=n;return o}async function R(t){if(console.log(t,"$themeToLink"),console.log(C,"extend======="),console.log("data",t),C.loginIntercept&&!P.call(this)){console.log("走进来了");var e="/pages/login/main?back="+I(t)+"&params="+JSON.stringify(U(t.link));return p({pagePath:e}),!1}if(t.type&&t.link&&t.link.includes("dynamicForm")){if(!P.call(this)){console.log("走进来了--dynamicForm");var n="/pages/login/main?back="+I(t)+"&params="+JSON.stringify(U(t.link));return p({pagePath:n}),!1}await g().then(function(e){t.link+="&token="+e}).catch(function(e){})}var i,o,a,r;1==c&&this.$store.getters["sceneModule/flushbonadingVisible"]?s.call(this,{data:t,Vue:d.Vue,Dialog:d.Dialog,Toast:d.Toast,hyl:d.hyl,dateFilter:d.dateFilter,shopConfig:d.shopConfig}):(e=t.type,console.log(t.key,"----------------------key"),(2==e||2!=c||t.key&&t.key.startsWith("1.9")||t.link&&t.link.startsWith("/activty/")||t.link.startsWith("/article/")||function(e){var t=I(e),n=x(e);if(L.includes(t)||"/goods/"==t.substr(0,7)||t.includes("/brandTopics")||P.call(this))return!(0<=(i=D(t)))||(i=0==i?D("/"):i,t="/"==t?"/pages/home/main":"/pages/tabBar"+i+"/main",(i=getCurrentPages())[i.length-1].route!=t&&(p({pagePath:t+(n?"?"+n:""),pageType:2}),0));var i="",i=-1<n.indexOf("scene=sso")?"/pages/login/main?back="+t+"&ossLink="+encodeURIComponent(n):"/pages/login/main?back="+t+"&params="+JSON.stringify(U(e.link));return console.log(i,"------------------------190"),p({pagePath:i}),0}(t))&&(null!=e&&"undefined"!=e?0==e||(1==e?"/"==t.link.substring(0,1)?1==c?p.call(this,{pagePath:t.link}):2==c&&(i="",i=t.link&&/\/article\/[\d]+/.test(t.link)?"/pages/pages_subpack/article/main?article_id="+(n=t.link.split("/"))[n.length-1]:T(I(t),x(t)),console.log("url",i),p({pagePath:i})):t.link.startsWith("http")||t.link.startsWith("https")?1==c?p.call(this,{pagePath:t.link,pageType:2}):(i="/pages/wxArticle/main?link="+encodeURIComponent(t.link),p({pagePath:i})):p({pagePath:t.link,pageType:2}):1.1==e?2==c?p({pagePath:t.link}):1==c&&(1==$.call(this)||2==$.call(this)?p.call(this,{pagePath:t.link,pageType:3}):h("暂不支持")):1.2==e?"outerChain:businessCenter"!=t.link?"/"==t.link.substring(0,1)?p.call(this,{pagePath:t.link}):1==c?1==this.$store.state.miniProgram||2==this.$store.state.miniProgram?(o="/pages/wxArticle/main?link="+encodeURIComponent(t.link),p.call(this,{pagePath:o,pageType:3})):p.call(this,{pagePath:t.link,pageType:2}):2==c&&(o="/pages/wxArticle/main?link="+encodeURIComponent(t.link),p.call(this,{pagePath:o,pageType:1})):(console.log(b(),"-----getGUIDE_URL()"),a=b()+"/login?mixid="+this.$nuxt.$route.query.mixid+"&back="+encodeURIComponent(window.location.href),p.call(this,{pagePath:a,pageType:2})):2==e?"themeCouponClick"==(a=t.feature.type)||0==a?1==c?this.$themeCouponClick(t.feature.value.couponCode,t.feature.value):2==c&&u.getCoupon(t.feature.value.couponCode,t.feature.value):1==a?2==t.type&&1==t.feature.type&&function(e){1==c?this.$nuxt.$SHARE({itemList:e.feature.value}):2==c&&u.shareInit({itemList:e.feature.value})}.call(this,t):"themeMemberCardClick"!=a&&2!=a||(1==c?this.$themeMemberCardClick(t.feature.value):2==c&&u.themeMemberCardClick(t.feature.value)):3==e?(console.log(c,"-----------------homeNative"),1==c?1==$.call(this)||2==$.call(this)?(e=this.$store.getters["sceneModule/flushbonadingVisible"]?"/pages/toMini/toMini?weappPage="+encodeURIComponent(t.link)+"&weappAppId="+t.name:"/pages/toMini/main?weappPage="+encodeURIComponent(t.link)+"&weappAppId="+t.name,p.call(this,{pagePath:e,pageType:3})):h("暂不支持"):t.key&&t.key.startsWith("1.9")?function(e){if(console.log("sss",e),2==c)switch(e.key){case"1.9.1":console.log("begin"),y.openChannelsActivity?y.openChannelsActivity({finderUserName:e.name,feedId:e.link,success:function(){console.log("success")},fail:function(){console.log("fail"),E.call(this,"提示","打开视频号失败")}}):E.call(this),console.log("end");break;case"1.9.2":console.log("begin"),y.openChannelsEvent?y.openChannelsEvent({finderUserName:e.name,eventId:e.link,fail:function(){E.call(this,"提示","打开视频号活动失败")}}):E.call(this),console.log("end")}}.call(this,t):(r="/pages/toMini/main?weappPage="+encodeURIComponent(t.link)+"&weappAppId="+t.name,p({pagePath:r}))):0<t.length&&p.call(this,{pagePath:t.link})):0<t.length&&(1==c?p.call(this,{pagePath:t}):2==c&&(r=T(I(t),x(t)),p({pagePath:r})))))}function E(){y.showModal({title:0<arguments.length&&void 0!==arguments[0]?arguments[0]:"提示",content:1<arguments.length&&void 0!==arguments[1]?arguments[1]:"当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。"}),console.log("不支持")}t.themeToLinkInit=e}.call(this)}.call(this,e("_process"),"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{_process:1}]},{},[2]);
\ No newline at end of file

src/utils/tool.js

+/*函数节流*/
+function throttle(fn, interval) {
+    var enterTime = 0;//触发的时间
+    var gapTime = interval || 300;//间隔时间，如果interval不传，则默认300ms
+    return function () {
+        var context = this;
+        var backTime = new Date();//第一次函数return即触发的时间
+        if (backTime - enterTime > gapTime) {
+            fn.call(context, arguments);
+            enterTime = backTime;//赋值给第一次触发的时间，这样就保存了第二次触发的时间
+        }
+    };
+}
+
+/*函数防抖*/
+function debounce(fn, interval) {
+    console.log('防抖抖~~~');
+    var timer;
+    var gapTime = interval || 1000;//间隔时间，如果interval不传，则默认1000ms
+    return function () {
+        clearTimeout(timer);
+        var context = this;
+        var args = arguments;//保存此处的arguments，因为setTimeout是全局的，arguments不是防抖函数需要的。
+        timer = setTimeout(function () {
+            fn.call(context, args);
+        }, gapTime);
+    };
+}
+
+export default {
+    throttle,
+    debounce
+};
\ No newline at end of file

static/vant/tabs/index.wxs

@@ -59,9 +59,9 @@ function trackStyle(data) {
 
 function lineStyle(data) {
   return style({
-    width: utils.addUnit(data.lineWidth - 16),
+    width: utils.addUnit(data.lineWidth - 32),
     transform: 'translateX(' + (data.lineOffsetLeft +16) + 'px)',
-    '-webkit-transform': 'translateX(' + (data.lineOffsetLeft + 8) + 'px)',
+    '-webkit-transform': 'translateX(' + (data.lineOffsetLeft + 16) + 'px)',
     'background-color': data.color,
     height: data.lineHeight !== -1 ? utils.addUnit(data.lineHeight) : null,
     'border-radius':