Merge remote-tracking branch 'origin/developerB' into developer

src/main/resources/static/css/article/article.css

@@ -232,7 +232,7 @@ dl,dd,dt{zoom:1}
 	.dea-tag a{display:inline-block;color:#fff;height:32px;line-height:32px;padding:0 12px;background:#e15616;text-align:center;border-radius:4px;margin-right:15px;cursor:pointer;margin-bottom: 10px}
 	.article .like:hover{background: #ffe6dc}
 	/*ross广告图*/
-	.article-right-ross{width:284px;height:343px;background: #F3920D;text-align: center;line-height: 343px;font-size: 50px;color: #FFFFFF;border-radius: 2px;margin-bottom: 16px;}
+	.article-right-ross{width:284px;height:343px;float: right; background: #F3920D;text-align: center;line-height: 343px;font-size: 50px;color: #FFFFFF;border-radius: 2px;margin-bottom: 16px;}
 	.article-right-ross.none{display: none;}
 	.article-right-ross.show{display: block;}
 	.article-right-ross>a{width: 100%;height: 100%;display: block;border-radius: 2px;}

src/main/resources/static/js/account/login.js

@@ -1,5 +1,6 @@
 var loginPage = new Vue({
     el: "#loginPage",
+    mixins: [cmSysVitaMixins],
     data: {
         maxtime:60,
         loginLoading: false,

src/main/resources/static/js/account/register-club.js

@@ -1,5 +1,6 @@
 var registerPage = new Vue({
     el: "#registerPage",
+    mixins: [cmSysVitaMixins],
     data: {
         loginLoading: false,
         showTabContentIndex:1,

src/main/resources/static/js/account/register-supplier.js

@@ -1,5 +1,6 @@
 var registerPage = new Vue({
     el: "#registerPage",
+    mixins: [cmSysVitaMixins],
     data: {
         loginLoading:false,
         showTabContentIndex:2,

src/main/resources/static/js/article/common.js

@@ -1,7 +1,6 @@
 /*var articleTypeNav = new Swiper('#articleTypeNav');*/
 var articleSide = new Vue({
     el: '#articleSide',
-    mixins: [cmSysVitaMixins],
     data: {
         typeId: 0,
         labelId: 0,

src/main/resources/static/js/article/list.js

@@ -59,10 +59,12 @@ var articleList = new Vue({
     },
     created: function () {
         // 判断登录状态
+        var self = this;
         if (globalUserData.token) {
             this.loginStatus = true;
         }
-        var self = this;
+        this.cmSysParams.pageType = 18;
+        this.cmSysParams.pageLabel = $('.newTitle').text();
         this.$nextTick(function () {
             self.initQueryParam();
             self.initBase();

src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -581,7 +581,7 @@ var PublicApi = {
                     callback(res)
                 });
         },
-        userRecordStatistics: function (params, callback) {//上送统计用户浏览记录
+        userRecordStatisticsApp: function (params, callback) {//上送统计用户浏览记录
             Http.AjaxService({
                 url: '/user/record/Statistics',
                 type:'get',

src/main/resources/static/js/document/beauty-archive.js

@@ -10,6 +10,7 @@ $(window).on('resize', function () {
 //美业资料库列表
 var beautyArchive = new Vue({
     el: '#beautyArchive',
+    mixins: [cmSysVitaMixins],
     data: {
         listLoading: false,
         total: 0, // 商品总数

src/main/resources/static/js/flea-market/form.js

@@ -483,8 +483,6 @@ var fleaMarketForm = new Vue({
     },
     mounted:function () {
         var _this = this;
-        this.cmSysParams.pageType = 4;
-        this.cmSysParams.pageLabel = '发布二手';
         SecondApi.brandList({},function (res) {//品牌列表
             if(res.code == 0){
                _this.BrandList = res.data;

src/main/resources/static/js/flea-market/list.js

@@ -158,12 +158,10 @@ var fleaMarketList = new Vue({
      },
      mounted:function () {
         var _this = this;
-        this.cmSysParams.pageType = 3;
-        this.cmSysParams.pageLabel = '二手市场';
-          var userInfo = JSON.parse(localStorage.getItem('userInfo'));
-          if(userInfo){
-              _this.userId = userInfo.userId;
-          }
+        var userInfo = JSON.parse(localStorage.getItem('userInfo'));
+        if(userInfo){
+            _this.userId = userInfo.userId;
+        }
          _this.gettabList();
          setTimeout(function(){  // 图片懒加载
              $("img[data-original]").lazyload();

src/main/resources/static/js/help/details.js

@@ -1,6 +1,6 @@
-;
 var orderPage = new Vue({
     el: "#beansPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:false,
         newsData:{},

src/main/resources/static/js/help/help.js

@@ -3,6 +3,7 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
 
 var helpSuggestion = new Vue({
     el: "#suggestion",
+    mixins: [cmSysVitaMixins],
     data: {
         btnLoading: false,
         userId: 0,

src/main/resources/static/js/help/news.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#beansPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:false,
         noMore: false,
@@ -74,6 +75,8 @@ var orderPage = new Vue({
         }
     },
     mounted: function () {
+        this.cmSysParams.pageType = 15;
+        this.cmSysParams.pageLabel = '公告列表';
         this.GetNewsList();
     }
 });

src/main/resources/static/js/index.js

@@ -360,8 +360,6 @@ var homeData = new Vue({
     },
     mounted: function() {
         var _this = this;
-        this.cmSysParams.pageType = 1;
-        this.cmSysParams.pageLabel = '首页';
         // 页面主图轮播
         this.swiperBanner();
         // 获取设置商品价格

src/main/resources/static/js/mixins/cmSysMixins.js

@@ -4,9 +4,8 @@ var cmSysVitaMixins = function () {
     return {
         data() {
             return {
-                browseTime: 0,  // 浏览时长初始值为 0
-                clearTimeSet: null,
                 cmSysParams:{
+                    accessClient: 0,// 来源 0网站 1小程序
                     pagePath:'',//页面路径
                     accessDuration:0,//停留时间
                     pageType:'',//页面类型
@@ -38,9 +37,18 @@ var cmSysVitaMixins = function () {
             }
         },
         methods: {
-            setTime() {
+            // 校验返回页面类型
+            checkedIsIncludeType(url){
+                if (!url) return false
+                return includeList.find(item => url === item.url)
+            },
+            // 校验是否为配置的路径
+            checkedIsInclude(url) {
+                if (!url) return false
+                return includeList.some(item => url === item.url)
+            },
+            handleCmSysNetInfo() {
                 //设置定时器
-                let _self = this;
                 const globalUserData = JSON.parse(localStorage.getItem('userInfo'));
                 if(globalUserData){ this.cmSysParams.userId = globalUserData.userId * 1; }
                 if( this.productIds.includes(this.handleProsId*1) ||
@@ -54,36 +62,27 @@ var cmSysVitaMixins = function () {
                         this.userInformationIsClick()
                     }
                 }
-                this.cmSysParams.pagePath = window.location.href;
-                this.clearTimeSet = setInterval(() => {
-                    _self.browseTime++;
-                }, 1000);
+                const pageUrls = window.location.pathname;
+                const pagePath = window.location.href;
+                if(this.checkedIsInclude(pageUrls)){
+                    const pageData = this.checkedIsIncludeType(pageUrls);
+                    this.cmSysParams.pageType = pageData ? pageData.pageType : '';
+                    this.cmSysParams.pageLabel = pageData ? pageData.pageLabel : '';
+                }
+                this.cmSysParams.pagePath = pagePath;
+                setTimeout(()=>{
+                    this.handleSetNetworks(this.cmSysParams);
+                },1000)
             },
-            userRecordStatistics(url,data) {// navigator.sendBeacon 方式  发送统计数据
-                const blob = new Blob([JSON.stringify(data)], {
-                    type: 'application/json; charset=UTF-8',
+            handleSetNetworks(params){// 进入页面执行统计
+                console.log(`页面路径:${params.pagePath}`,`标签:${params.pageLabel}`)
+                PublicApi.userRecordStatisticsApp(params,function(response){
+                     if(response.code === 0){
+                         console.log('上送浏览记录统计成功~')
+                     }else{
+                         console.log('上送浏览记录统计失败~')
+                     }
                 });
-                navigator.sendBeacon(url, blob);
-            },
-            beforeunloadHandler(e) {
-                this.cmSysParams.accessDuration = this.browseTime*1000
-                console.log(`页面路径:${this.cmSysParams.pagePath}`,`停留:${this.cmSysParams.accessDuration}s`,`标签:${this.cmSysParams.pageLabel}`)
-                var NODE_ENV_BASE_URL = $("#coreServer").val();
-                var url = `${NODE_ENV_BASE_URL}/user/record/StatisticsPc`
-                this.userRecordStatistics(url,this.cmSysParams); // 上送后台接口，将浏览时长等信息传到后台，离开当前路由后调用
-                clearInterval(this.clearTimeSet); // 离开页面后清除定时器
-            },
-            handleWindow(type){
-                const isBrowser = isPC ? 1 : 0;
-                const map = {
-                    0: 'pagehide',
-                    1: 'beforeunload',
-                };
-                const FunMap = {
-                    0:window.addEventListener(map[isBrowser], e => this.beforeunloadHandler(e)), // 绑定
-                    1:window.removeEventListener(map[isBrowser], e => this.beforeunloadHandler(e)) // 接触绑定
-                }
-                return FunMap[type];
             },
             handleInputName(e){
                 this.consultParams.consultName = e.target.value;
@@ -94,11 +93,7 @@ var cmSysVitaMixins = function () {
                 this.handldeCheckInput();
             },
             handldeCheckInput(){
-                if(this.consultParams.consultName !== "" && this.consultParams.consultMobile !==""){
-                    this.isDisabled =false;
-                }else{
-                    this.isDisabled =true;
-                }
+                this.isDisabled = !(this.consultParams.consultName !== "" && this.consultParams.consultMobile !== "");
             },
             handleSubmit(){
                 // 提交联系人信息
@@ -118,7 +113,7 @@ var cmSysVitaMixins = function () {
                 //查询是否需要弹Ross广告
                 let _self = this;
                 PublicApi.userInformationIsClick({}, function (response) {
-                    if(response.code == 0){
+                    if(response.code === 0){
                         if(response.data){
                             setTimeout(()=>{
                                 _self.showRossHtml = true
@@ -133,7 +128,7 @@ var cmSysVitaMixins = function () {
                 //提交记录咨询人&&关闭弹窗
                 let _self = this;
                 PublicApi.userInformationInsertRoos(params, function (response) {
-                    if(response.code == 0){
+                    if(response.code === 0){
                         _self.showRossHtml = false
                     }else{
                         console.log('error',response.msg);
@@ -144,25 +139,42 @@ var cmSysVitaMixins = function () {
                 //查看访问者是否浏览过roos相关页面
                 let _self = this;
                 PublicApi.userInformationVisitRoos(params, function (response) {
-                    if(response.code == 0){
+                    if(response.code === 0){
                         _self.isRossShow = response.data
                     }else{
                         console.log('error',response.msg);
                     }
                 })
-            }
+            },
+            userRecordStatistics() {// navigator.sendBeacon 方式 暂时废弃
+                const NODE_ENV_BASE_URL = $("#coreServer").val();
+                const url = `${NODE_ENV_BASE_URL}/user/record/StatisticsPc`;
+                const blob = new Blob([JSON.stringify(this.cmSysParams)], {
+                    type: 'application/json; charset=UTF-8',
+                });
+                navigator.sendBeacon(url, blob);
+            },
+            handleWindow(type){ // 暂时废弃
+                const isBrowser = isPC ? 1 : 0;
+                const map = {
+                    0: 'pagehide',
+                    1: 'beforeunload',
+                };
+                const FunMap = {
+                    0:window.addEventListener(map[isBrowser], e => this.beforeunloadHandler(e)), // 绑定
+                    1:window.removeEventListener(map[isBrowser], e => this.beforeunloadHandler(e)) // 接触绑定
+                }
+                return FunMap[type];
+            },
         },
         mounted() {
-            // 页面加载完成后开始计时
-            this.setTime();
-            // 绑定窗口[监听]事件
-            this.handleWindow(0)
+            // 页面加载完成后[监听]执行事件
+            this.handleCmSysNetInfo()
             // 查看访问者是否浏览过roos相关页面
             this.userInformationVisitRoos({ userId: this.cmSysParams.userId })
         },
         destroyed() {
-            // 解除窗口关闭[监听]事件
-            this.handleWindow(1)
+
         }
     }
 }();

src/main/resources/static/js/mixins/router.config.js

@@ -0,0 +1,73 @@
+const includeList = [
+    { title:'商城首页',url:'/',pageLabel:'商城首页',pageType:1 },
+    { title:'商城首页',url:'/index.html',pageLabel:'商城首页',pageType:1 },
+    { title:'二手市场',url:'/flea-market/list.html',pageLabel:'二手市场',pageType:3 },
+    { title:'发布二手',url:'/flea-market/form.html',pageLabel:'发布二手',pageType:4 },
+    { title:'公告列表',url:'/news.html',pageLabel:'公告列表',pageType:15 },
+    { title:'公告详情',url:'/news/details.html',pageLabel:'公告详情',pageType:16 },
+    { title:'二手介绍',url:'/flea-market/intro.html',pageLabel:'二手介绍',pageType:17 },
+    { title:'美业资料',url:'/document/beauty-archive.html',pageLabel:'美业资料',pageType:20 },
+    { title:'登录页',url:'/login.html',pageLabel:'登录',pageType:21 },
+    { title:'注册页',url:'/club/register.html',pageLabel:'机构注册',pageType:22 },
+    { title:'注册页',url:'/supplier/register.html',pageLabel:'供应商注册',pageType:23 },
+    { title:'帮助中心',url:'/help/1000.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1033.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1039.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1034.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1036.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1031.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1038.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1035.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1013.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1014.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1023.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1040.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1016.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1019.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1037.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1003.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'帮助中心',url:'/help/1026.html',pageLabel:'帮助中心',pageType:24 },
+    { title:'机构个人中心',url:'/user/dashboard.html',pageLabel:'机构个人中心',pageType:25 },
+    { title:'机构编辑资料',url:'/user/setting/information.html',pageLabel:'机构编辑资料',pageType:26 },
+    { title:'机构站内消息',url:'/user/message/list.html',pageLabel:'机构站内消息',pageType:27 },
+    { title:'超级会员',url:'/user/member.html',pageLabel:'超级会员',pageType:28 },
+    { title:'账户余额',url:'/user/account.html',pageLabel:'账户余额',pageType:29 },
+    { title:'采美豆',url:'/user/beans.html',pageLabel:'采美豆',pageType:30 },
+    { title:'优惠券',url:'/user/coupon.html',pageLabel:'优惠券',pageType:31 },
+    { title:'收藏商品',url:'/user/collection.html',pageLabel:'收藏商品',pageType:32 },
+    { title:'机构订单列表',url:'/user/order/list.html',pageLabel:'机构订单列表',pageType:33 },
+    { title:'机构订单详情',url:'/user/order/detail.html',pageLabel:'机构订单详情',pageType:34 },
+    { title:'维修',url:'/user/repair/list.html',pageLabel:'维修',pageType:35 },
+    { title:'线下支付',url:'/pay/caimei-payunder.html',pageLabel:'线下支付',pageType:36 },
+    { title:'线上支付',url:'/pay/caimei-paylist.html',pageLabel:'线上支付',pageType:37 },
+    { title:'线上收银台',url:'/pay/caimei-hlbpay.html',pageLabel:'线上收银台',pageType:38 },
+    { title:'机构收货地址管理',url:'/user/address/list.html',pageLabel:'机构收货地址管理',pageType:39 },
+    { title:'机构运营人员管理',url:'/user/operation/list.html',pageLabel:'机构运营人员管理',pageType:40 },
+    { title:'机构购物车',url:'/shopping/cart.html',pageLabel:'机构购物车',pageType:41 },
+    { title:'机构重置密码',url:'/user/setting/password.html',pageLabel:'机构重置密码',pageType:42 },
+    { title:'机构更换手机号',url:'/user/setting/phone.html',pageLabel:'机构更换手机号',pageType:43 },
+    { title:'供应商个人中心',url:'/supplier/dashboard.html',pageLabel:'供应商个人中心',pageType:44 },
+    { title:'供应商编辑资料',url:'/supplier/setting/information.html',pageLabel:'供应商编辑资料',pageType:45 },
+    { title:'供应商站内消息',url:'/supplier/message/list.html',pageLabel:'供应商站内消息',pageType:46 },
+    { title:'供应商我的商品',url:'/supplier/goods.html',pageLabel:'供应商我的商品',pageType:47 },
+    { title:'供应商订单列表',url:'/supplier/order/list.html',pageLabel:'供应商订单列表',pageType:48 },
+    { title:'供应商订单详情',url:'/supplier/order/detail.html',pageLabel:'供应商订单详情',pageType:49 },
+    { title:'供应商发货',url:'/supplier/order/delivery.html',pageLabel:'供应商发货',pageType:50 },
+    { title:'供应商添加物流',url:'/supplier/order/logistics/add.html',pageLabel:'供应商添加物流',pageType:51 },
+    { title:'供应商发货记录',url:'/supplier/order/delivery_record.html',pageLabel:'供应商发货记录',pageType:52 },
+    { title:'供应商查看物流',url:'/supplier/order/logistics/detail.html',pageLabel:'供应商查看物流',pageType:53 },
+    { title:'供应商结算管理',url:'/supplier/order/settlement.html',pageLabel:'供应商结算管理',pageType:54 },
+    { title:'供应商装扮主页',url:'/supplier/decoration.html',pageLabel:'供应商装扮主页',pageType:55 },
+    { title:'供应商发布商品',url:'/supplier/release.html',pageLabel:'供应商发布商品',pageType:56 },
+    { title:'供应商品牌管理',url:'/supplier/brand.html',pageLabel:'供应商品牌管理',pageType:57 },
+    { title:'产品采美百科',url:'/supplier/encyclopedia/product-list.html',pageLabel:'产品采美百科',pageType:58 },
+    { title:'仪器产品百科',url:'/supplier/encyclopedia/instrument-list.html',pageLabel:'仪器产品百科',pageType:59 },
+    { title:'添加产品百科',url:'/supplier/encyclopedia/product-edit.html',pageLabel:'添加产品百科',pageType:60 },
+    { title:'添加仪器百科',url:'/supplier/encyclopedia/instrument-edit.html',pageLabel:'添加仪器百科',pageType:61 },
+    { title:'供应商员工管理',url:'/supplier/operation/list.html',pageLabel:'供应商员工管理',pageType:62 },
+    { title:'供应商添加运营人员',url:'/supplier/operation/form.html',pageLabel:'供应商添加运营人员',pageType:63 },
+    { title:'文章管理',url:'/supplier/article/list.html',pageLabel:'文章管理',pageType:64 },
+    { title:'添加文章',url:'/supplier/article/edit.html',pageLabel:'添加文章',pageType:65 },
+    { title:'供应商重置密码',url:'/supplier/setting/password.html',pageLabel:'供应商重置密码',pageType:66 },
+    { title:'供应商更换手机号',url:'/supplier/setting/phone.html',pageLabel:'供应商更换手机号',pageType:67 },
+]

src/main/resources/static/js/pay/caimei-hlbpay.js

@@ -3,7 +3,7 @@
  */
 var payContainer = new Vue({
     el:"#payContainer",
-    mixins: [hlbPayMixin],
+    mixins: [hlbPayMixin,cmSysVitaMixins],
     data: {
         isSubMitStatus:false,
         B2BpayFlag:1,//企业网银支付开关

src/main/resources/static/js/pay/caimei-paylist.js

@@ -2,7 +2,7 @@
  *Created by ZHJY on 2020/7/14.
  */
 var payContainer = new Vue({
-    mixins: [bankMixins],
+    mixins: [bankMixins,cmSysVitaMixins],
     el:"#payContainer",
     data: {
         loginLoading:true,

src/main/resources/static/js/pay/caimei-payunder.js

@@ -2,7 +2,7 @@
  *Created by ZHJY on 2020/7/14.
  */
 var payContainer = new Vue({
-    mixins: [bankMixins],
+    mixins: [bankMixins,cmSysVitaMixins],
     el:"#payContainer",
     data: {
         payAmount:0,

src/main/resources/static/js/product/list.js

@@ -89,7 +89,7 @@ var productList = new Vue({
             // 商品价格仅资质机构可见
             if(pros.priceFlag === 2  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE == 1) return true;
+            if(pros.priceFlag === 3  && pros.svipProductFlag === 1 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE === 1) return true;
             // 其它
             return false;
         },
@@ -115,7 +115,7 @@ var productList = new Vue({
         },
         PromotionsFormat:function(promo){//促销活动类型数据处理
             if(promo!=null){
-                if(promo.type == 1 && promo.mode == 1){
+                if(promo.type === 1 && promo.mode === 1){
                     return true
                 }else{
                     return false
@@ -153,12 +153,7 @@ var productList = new Vue({
                     }else{
                         _self.listData = _self.listData.concat(resultData);
                     }
-                    console.log('listData',_self.listData)
-                    if( _self.listData.length>0){
-                        _self.isListEmpty = false;
-                    }else{
-                        _self.isListEmpty = true;
-                    }
+                    _self.isListEmpty = _self.listData.length <= 0;
                     _self.listLoading = false;
                     _self.requestFlag = true;
                 }else {

src/main/resources/static/js/shopping/cart.js

@@ -1,6 +1,6 @@
 var shoppingCart = new Vue({
     el: "#shoppingCart",
-    mixins: [cartMixins],
+    mixins: [cartMixins,cmSysVitaMixins],
     data: {
         userId: 0,
         userIdentity: '',

src/main/resources/static/js/supplier-center/article/article-edit.js

@@ -3,6 +3,7 @@ const Editor = window.createEditorComponent();
 
 var articleEdit = new Vue({
     el: '#articleEdit',
+    mixins: [cmSysVitaMixins],
     components: {
         Editor
     },

src/main/resources/static/js/supplier-center/article/article-list.js

@@ -2,6 +2,7 @@
 
 var articleList = new Vue({
     el: '#articleList',
+    mixins: [cmSysVitaMixins],
     data: {
         name: 'supplier-article-list',
         refreshType: '',

src/main/resources/static/js/supplier-center/dashboard.js

@@ -1,5 +1,6 @@
 ;var dashboard = new Vue({
     el:'#dashboard',
+    mixins: [cmSysVitaMixins],
     data:{
         isRequset:true,
         userId:'',

src/main/resources/static/js/supplier-center/encyclopedia/instrument-edit.js

@@ -6,7 +6,7 @@ const app = new Vue({
         Editor,
         FormVideoGroup
     },
-
+    mixins: [cmSysVitaMixins],
     data() {
         var validateQuestionList = (rule, value, callback) => {
             if (!value) {

src/main/resources/static/js/supplier-center/encyclopedia/instrument-list.js

@@ -4,6 +4,7 @@ console.log(123);
 
 var productList = new Vue({
     el: '#productList',
+    mixins: [cmSysVitaMixins],
     data: {
         name: 'supplier-instrument-list',
         refreshType: '',

src/main/resources/static/js/supplier-center/encyclopedia/product-edit.js

@@ -8,7 +8,7 @@ const app = new Vue({
         Editor,
         FormVideoGroup
     },
-
+    mixins: [cmSysVitaMixins],
     data() {
         var validateQuestionList = (rule, value, callback) => {
             if (!value) {

src/main/resources/static/js/supplier-center/encyclopedia/product-list.js

@@ -4,6 +4,7 @@ console.log(123);
 
 var productList = new Vue({
     el: '#productList',
+    mixins: [cmSysVitaMixins],
     data: {
         name: 'supplier-product-list',
         refreshType: '',

src/main/resources/static/js/supplier-center/message.js

@@ -1,6 +1,6 @@
 ;var helpSuggestion = new Vue({
     el: "#dashboard",
-    mixins: [noticeMixin],
+    mixins: [noticeMixin,cmSysVitaMixins],
     data: {
         btnLoading: false,
         isRequset:false,

src/main/resources/static/js/supplier-center/operation/form.js

@@ -1,6 +1,7 @@
 ;
 var operationPage = new Vue({
     el: "#operationPage",
+    mixins: [cmSysVitaMixins],
     data: {
         loginLoading: false,
         userId: 0,

src/main/resources/static/js/supplier-center/operation/list.js

@@ -1,6 +1,7 @@
 ;
 var operationPage = new Vue({
     el: "#operationPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,

src/main/resources/static/js/supplier-center/order/delivergoods.js

@@ -1,6 +1,7 @@
 ;
 var delivergoods = new Vue({
     el: '#delivergoods',
+    mixins: [cmSysVitaMixins],
     data: {
         shopOrderId: '',
         userInfo: {},

src/main/resources/static/js/supplier-center/order/detail.js

@@ -1,6 +1,7 @@
 ;
 var seeDetail = new Vue({
     el:'#seeDetail',
+    mixins: [cmSysVitaMixins],
     data:{
         shopOrderId:'',
         userInfo:{},

src/main/resources/static/js/supplier-center/order/logistics-add.js

@@ -1,6 +1,7 @@
 ;
 var addlogistics = new Vue({
     el:'#addlogistics',
+    mixins: [cmSysVitaMixins],
     data:{
         open:false,
         userInfo:{},

src/main/resources/static/js/supplier-center/order/logistics-detail.js

@@ -1,6 +1,7 @@
 ;
 var logisticsDetail  = new Vue({
     el:'#logisticsDetail',
+    mixins: [cmSysVitaMixins],
     data:{
         params:{
             logisticsBatchId:'',

src/main/resources/static/js/supplier-center/order/logistics.js

@@ -1,6 +1,7 @@
 ;
 var logistics = new Vue({
     el:'#logistics',
+    mixins: [cmSysVitaMixins],
     data:{
          userInfo:{},
          orderList:[],

src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -1,6 +1,7 @@
 ;
 var orderList = new Vue({
     el:'#orderList',
+    mixins: [cmSysVitaMixins],
     data:{
         Status:[
             {name:'所有',value:0},

src/main/resources/static/js/supplier-center/order/record.js

@@ -1,6 +1,7 @@
 ;
 var deliveryRecode = new Vue({
     el:'#deliveryRecode',
+    mixins: [cmSysVitaMixins],
     data:{
     userInfo:{},
     results:[],

src/main/resources/static/js/supplier-center/order/settlement.js

@@ -1,6 +1,7 @@
 ;
 var settlement = new Vue({
     el:'#settlement',
+    mixins: [cmSysVitaMixins],
     data:{
         params:{
             shopId:'',

src/main/resources/static/js/supplier-center/setting/information.js

@@ -1,6 +1,7 @@
 ;
  var information = new Vue({
     el:'#information',
+     mixins: [cmSysVitaMixins],
     data:{
          tabCurrentIndex:1,
          loginLoading: false,

src/main/resources/static/js/supplier-center/setting/password.js

@@ -1,6 +1,7 @@
 ;
 var passwordPage = new Vue({
     el: "#passwordPage",
+    mixins: [cmSysVitaMixins],
     data: {
         title:'手机找回密码',
         loginLoading: false,

src/main/resources/static/js/supplier-center/setting/phone.js

@@ -1,6 +1,7 @@
 ;
 var phonePage = new Vue({
     el: "#phonePage",
+    mixins: [cmSysVitaMixins],
     data: {
         loginLoading:false,
         count: '',					//倒计时

src/main/resources/static/js/supplier-center/shop/brand.js

@@ -1,6 +1,7 @@
 ;
 var Brandgoods =new Vue({
     el:'#Brandgoods',
+    mixins: [cmSysVitaMixins],
     data:{
       params:{
              userId: 0,

src/main/resources/static/js/supplier-center/shop/decoration.js

@@ -1,6 +1,7 @@
 ;
 var decoration = new Vue({
     el:'#decoration',
+    mixins: [cmSysVitaMixins],
     data:{
         iconflag:true,
         bgflag:false,

src/main/resources/static/js/supplier-center/shop/goods.js

@@ -1,6 +1,7 @@
 ;
 var myGoods = new Vue({
     el:"#myGoods",
+    mixins: [cmSysVitaMixins],
     data: {
         userId:0,
         shopId:'',

src/main/resources/static/js/supplier-center/shop/release.js

@@ -5,7 +5,7 @@ $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a')
 $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(2).addClass("on");
 var releaseContainer = new Vue({
     el:"#releaseContainer",
-    mixins: [getInfoMixins,checkeMixins,releaseMixins],
+    mixins: [getInfoMixins,checkeMixins,releaseMixins,cmSysVitaMixins],
     data: {
         NODE_ENV_BASE_URL:'',
         releaseType:'',

src/main/resources/static/js/user-center/account/account.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#beansPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,

src/main/resources/static/js/user-center/account/beans.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#beansPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,

src/main/resources/static/js/user-center/account/coupon.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#beansPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,

src/main/resources/static/js/user-center/address/list.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#orderPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         isShwoAddModel:false,

src/main/resources/static/js/user-center/collection/collection.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#productList",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,

src/main/resources/static/js/user-center/dashboard.js

@@ -1,6 +1,7 @@
 ;
 var helpSuggestion = new Vue({
     el: "#dashboard",
+    mixins: [cmSysVitaMixins],
     data: {
         btnLoading: false,
         isRequset:true,

src/main/resources/static/js/user-center/member/memberPage.js

@@ -51,6 +51,7 @@ var serviceList = [
 ];
 var memberPage = new Vue({
     el: '#memberPage',
+    mixins: [cmSysVitaMixins],
     data: {
         serviceList: serviceList, // 服务列表
         comboInfo: [], // svip套餐信息

src/main/resources/static/js/user-center/message.js

@@ -1,7 +1,7 @@
 ;
 var helpSuggestion = new Vue({
     el: "#dashboard",
-    mixins: [noticeMixin],
+    mixins: [noticeMixin,cmSysVitaMixins],
     data: {
         btnLoading: false,
         isRequset:true,

src/main/resources/static/js/user-center/operation/list.js

@@ -1,6 +1,7 @@
 ;
 var operationPage = new Vue({
     el: "#operationPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,
@@ -176,7 +177,6 @@ var operationPage = new Vue({
             this.listQuery.userId = this.userId;
             this.GetQueryListData();
         }
-        console.log(this.listQuery.orderState)
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(1).addClass("on");
 

src/main/resources/static/js/user-center/order/detail.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#orderPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         orderId:0,              //订单ID

src/main/resources/static/js/user-center/order/list.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#orderPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,

src/main/resources/static/js/user-center/repair/list.js

@@ -1,6 +1,7 @@
 ;
 var orderPage = new Vue({
     el: "#orderPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         noMore: false,

src/main/resources/static/js/user-center/setting/information.js

@@ -1,6 +1,7 @@
 ;
 var informationPage = new Vue({
     el: "#informationPage",
+    mixins: [cmSysVitaMixins],
     data: {
         isRequset:true,
         loginLoading: false,

src/main/resources/static/js/user-center/setting/password.js

@@ -1,6 +1,7 @@
 ;
 var passwordPage = new Vue({
     el: "#passwordPage",
+    mixins: [cmSysVitaMixins],
     data: {
         title:'手机找回密码',
         loginLoading: false,

src/main/resources/static/js/user-center/setting/phone.js

@@ -1,6 +1,7 @@
 ;
 var phonePage = new Vue({
     el: "#phonePage",
+    mixins: [cmSysVitaMixins],
     data: {
         loginLoading:false,
         count: '',					//倒计时

src/main/resources/templates/article/components/article-sidebar.html

@@ -1,9 +1,9 @@
 <html xmlns:th="http://www.w3.org/1999/xhtml">
 <div class="other" id="articleSide" v-cloak>
-    <!--侧边栏Ross广告图-->
-    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
-        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
-    </div>
+<!--    &lt;!&ndash;侧边栏Ross广告图&ndash;&gt;-->
+<!--    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">-->
+<!--        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>-->
+<!--    </div>-->
     <div id="mHotWord">
         <div class="tags clearfix">
             <p class="classify">

src/main/resources/templates/article/detail.html

@@ -87,6 +87,10 @@
             </template>
         </div>
     </div>
+    <!--侧边栏Ross广告图-->
+    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
+        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+    </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>
 
@@ -94,7 +98,6 @@
 <template th:replace="article/components/article-footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.qrcode.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/detail.js(v=${version})}"></script>
 </body>

src/main/resources/templates/article/list.html

@@ -20,7 +20,6 @@
 <!--主体内容-->
 <div class="content clearfix" id="ArticleContent">
     <!--侧边栏Ross广告图-->
-
     <div class="mainData">
         <div class="new-list" id="articleList" v-cloak>
             <div v-if="!isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'"><a href="/supplier-1378.html" ><img src="/img/ross/ross-image@2x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a></div>
@@ -118,6 +117,10 @@
             </div>
         </div>
     </div>
+    <!--侧边栏Ross广告图-->
+    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
+        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+    </div>
     <!--侧边栏-->
     <template th:replace="article/components/article-sidebar"></template>
     <div id="scrollTop">
@@ -133,7 +136,6 @@
 <script charset="utf-8" type="text/javascript" src="/lib/datapicker/jquery.daterangepicker.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
 </body>

src/main/resources/templates/components/foot-link.html

@@ -9,5 +9,7 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/shopping.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/utils.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/router.config.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/auto-input.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/base.js(v=${version})}"></script>

src/main/resources/templates/document/beauty-archive.html

@@ -100,8 +100,9 @@
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript"
-        th:src="@{/js/common/serviceapi/beautyArchive.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/router.config.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/beautyArchive.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/auto-input.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/document/beauty-archive.js(v=${version})}"></script>
 

src/main/resources/templates/document/components/document-link.html

@@ -7,4 +7,6 @@
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/locallhostAjax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/utils.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/router.config.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/document/base.js(v=${version})}"></script>

src/main/resources/templates/flea-market/form.html

@@ -222,7 +222,6 @@
 <script charset="utf-8" type="text/javascript"
         th:src="@{/js/common/serviceapi/second.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/flea-market/form.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/flea-market/intro.html

@@ -109,10 +109,22 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-
 </body>
 <script>
-     $(document).ready(function() {
+    var marketIntro = new Vue({
+        el: "#fleaMarket",
+        mixins: [cmSysVitaMixins],
+        data: {
+
+        },
+        methods: {
+
+        },
+        mounted: function () {
+
+        }
+    });
+    $(document).ready(function() {
         $('#second-hand-btn button').on('click',function() {
             var index = $(this).index();
             if(index == 0) {