修改

mallApp/dist/build/mp-weixin/app.json

@@ -117,5 +117,6 @@
   },
   "usingComponents": {
     "tab-bar": "/components/app-tabbar"
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }

mallApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/components/app-img.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/components/module/app-trademark.js

@@ -1,4 +1,4 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-trademark"],{"1af1":function(n,t,e){},"67be":function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return a}));var r=function(){var n=this,t=n.$createElement;n._self._c},u=[]},"6e39":function(n,t,e){"use strict";var a=e("1af1"),r=e.n(a);r.a},7178:function(n,t,e){"use strict";e.r(t);var a=e("fc62"),r=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);t["default"]=r.a},ea75:function(n,t,e){"use strict";e.r(t);var a=e("67be"),r=e("7178");for(var u in r)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(u);e("6e39");var c,f=e("0095"),o=Object(f["a"])(r["default"],a["b"],a["c"],!1,null,"3eacdbf8",null,!1,a["a"],c);t["default"]=o.exports},fc62:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={name:"app-trademark",data:function(){return{constant:this.$constant}}};t.default=a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/module/app-trademark"],{3497:function(n,t,e){"use strict";var a=e("4d44"),r=e.n(a);r.a},"4d44":function(n,t,e){},7178:function(n,t,e){"use strict";e.r(t);var a=e("fc62"),r=e.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(u);t["default"]=r.a},ea75:function(n,t,e){"use strict";e.r(t);var a=e("efc8"),r=e("7178");for(var u in r)["default"].indexOf(u)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(u);e("3497");var c,f=e("0095"),o=Object(f["a"])(r["default"],a["b"],a["c"],!1,null,"6e4718ea",null,!1,a["a"],c);t["default"]=o.exports},efc8:function(n,t,e){"use strict";var a;e.d(t,"b",(function(){return r})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){return a}));var r=function(){var n=this,t=n.$createElement;n._self._c},u=[]},fc62:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var a={name:"app-trademark",data:function(){return{constant:this.$constant}}};t.default=a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/module/app-trademark-create-component',
     {

mallApp/dist/build/mp-weixin/components/module/app-trademark.wxml

@@ -1 +1 @@
-<view class="app-trademark _div data-v-3eacdbf8"><view class="img-wrap _div data-v-3eacdbf8"><image src="{{constant.imgUrl+'/retail/common/trademark.png'}}" alt="{{true}}" mode="widthFix" class="_img data-v-3eacdbf8"></image></view></view>
+<view class="app-trademark _div data-v-6e4718ea"><view class="img-wrap _div data-v-6e4718ea"><image src="{{constant.imgUrl+'/retail/common/trademark.png'}}" alt="{{true}}" mode="widthFix" class="_img data-v-6e4718ea"></image></view></view>

mallApp/dist/build/mp-weixin/components/module/app-trademark.wxss

@@ -1 +1 @@
-.app-trademark.data-v-3eacdbf8{width:100%;padding:40rpx 0;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#f5f5f5}.app-trademark .img-wrap.data-v-3eacdbf8{width:138rpx}
+.app-trademark.data-v-6e4718ea{width:100%;padding:30rpx 0 120rpx 0;display:-webkit-box;display:flex;display:-webkit-flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;background-color:#f5f5f5}.app-trademark .img-wrap.data-v-6e4718ea{width:138rpx}

mallApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

mallApp/dist/build/mp-weixin/pages/goods/components/buy-foot.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/pages/home/components/goods-list-middle.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

mallApp/dist/build/mp-weixin/pages/home/index.wxml

@@ -1 +1 @@
-<view class="app-main app-content _div data-v-46e200d6"><block wx:if="{{!$root.g0}}"><app-swiper vue-id="6b3d36ea-1" list="{{ad}}" data-event-opts="{{[['^detail',[['adDetailFn']]]]}}" bind:detail="__e" class="data-v-46e200d6" bind:__l="__l"></app-swiper></block><block wx:if="{{!$root.g1}}"><block class="data-v-46e200d6"><block wx:for="{{category}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-module _div data-v-46e200d6"><block wx:if="{{item.showRow==1}}"><goods-list-big vue-id="{{'6b3d36ea-2-'+index}}" info="{{item}}" class="data-v-46e200d6" bind:__l="__l"></goods-list-big></block><block wx:if="{{item.showRow==2}}"><goods-list-small vue-id="{{'6b3d36ea-3-'+index}}" info="{{item}}" class="data-v-46e200d6" bind:__l="__l"></goods-list-small></block></view></block></block></block><app-trademark vue-id="6b3d36ea-4" class="data-v-46e200d6" bind:__l="__l"></app-trademark><tab-bar vue-id="6b3d36ea-5" current="{{0}}" class="data-v-46e200d6" bind:__l="__l"></tab-bar></view>
+<view class="app-main app-content _div data-v-40533425"><block wx:if="{{!$root.g0}}"><app-swiper vue-id="6b3d36ea-1" list="{{ad}}" data-event-opts="{{[['^detail',[['adDetailFn']]]]}}" bind:detail="__e" class="data-v-40533425" bind:__l="__l"></app-swiper></block><block wx:if="{{!$root.g1}}"><block class="data-v-40533425"><block wx:for="{{category}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="goods-module _div data-v-40533425"><block wx:if="{{item.showRow==1}}"><goods-list-big vue-id="{{'6b3d36ea-2-'+index}}" info="{{item}}" class="data-v-40533425" bind:__l="__l"></goods-list-big></block><block wx:if="{{item.showRow==2}}"><goods-list-small vue-id="{{'6b3d36ea-3-'+index}}" info="{{item}}" class="data-v-40533425" bind:__l="__l"></goods-list-small></block></view></block></block></block><app-trademark vue-id="6b3d36ea-4" class="data-v-40533425" bind:__l="__l"></app-trademark><tab-bar vue-id="6b3d36ea-5" current="{{0}}" class="data-v-40533425" bind:__l="__l"></tab-bar></view>

mallApp/dist/build/mp-weixin/pages/home/index.wxss

@@ -1 +1 @@
-.goods-module.data-v-46e200d6{padding:0 20rpx;margin-top:40rpx}.goods-module.data-v-46e200d6 .buy-com-btn{font-size:24rpx;padding:10rpx 20rpx 12rpx;box-shadow:8rpx 8rpx 20rpx #eee}
+.goods-module.data-v-40533425{padding:0 20rpx;margin-top:40rpx}.goods-module.data-v-40533425 .buy-com-btn{font-size:24rpx;padding:10rpx 20rpx 12rpx;box-shadow:8rpx 8rpx 20rpx #eee}

mallApp/dist/build/mp-weixin/pages/home/recent.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "最近访问",
+  "navigationBarTitleText": "首页",
   "usingComponents": {
     "app-avatar-module": "/components/module/app-avatar",
     "app-swiper": "/components/app-swiper",

mallApp/dist/build/mp-weixin/project.config.json

@@ -5,27 +5,54 @@
   },
   "setting": {
     "urlCheck": false,
-    "es6": true
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "",
   "appid": "wx99a1dfc4171efb42",
-  "projectname": "商城",
+  "projectname": "%E5%95%86%E5%9F%8E",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": -1,
       "list": []
     }
   }

mallApp/dist/build/mp-weixin/sitemap.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

mallApp/src/components/module/app-trademark.vue

@@ -21,7 +21,7 @@ export default {
 <style lang="scss" scoped>
 .app-trademark {
 	width: 100%;
-	padding: 40px 0;
+	padding: 30rpx 0 120rpx 0;
 	@include disFlex(center, center);
 	background-color: $backColor;
 	.img-wrap {

mallApp/src/mixins/globalMixins.js

@@ -27,6 +27,21 @@ export default {
 		}
 		let oldAccount = uni.getStorageSync('account')
 
+		//扫商城二维码
+		if(option.scene){
+			const scene = decodeURIComponent(option.scene)
+			var theRequest = new Object();
+			var strs = scene.split("&");
+			for (var i = 0; i < strs.length; i++) {
+				theRequest[strs[i].split('=')[0]] = decodeURI(strs[i].split('=')[1]);
+			}
+			if(theRequest.s){
+				option.account = theRequest.s
+				//员工id
+				//shopAdminId = theRequest.a
+			}
+		}
+
 		//扫门店收款二维码打开小程序付款页
 		//https://shop.theflorist.cn/#/pages/pay/index?account=36123
 		if(option.q){

mallApp/src/pages.json

@@ -2,7 +2,7 @@
     "pages": [{
             "path": "pages/home/recent",
             "style": {
-                "navigationBarTitleText": "最近访问"
+                "navigationBarTitleText": "首页"
             }
         },
         {

mallApp/src/pages/home/index.vue

@@ -65,7 +65,6 @@ export default {
   mounted () { },
   onShow () {
     uni.hideTabBar();
-    // this.init();
   },
   methods: {
     init () {

mallApp/src/pages/home/recent.vue

@@ -30,8 +30,8 @@
       :list="ad"
     />
     <div class="shop-wrap">
-      <div class="shop-tit">{{ shop.name }}</div>
-      <div>厦门市国兰花尚文化传播有限公司，于2010年由名师游俊涛老师、姜祖岚老师凭借18年的花艺资质，10年的教学经验，创办的花艺培训学校，每年都有几百名来自全国各地的学员出师，花店开遍福建省及全国各地，多位学员已成为行业中的佼佼者。。</div>
+      <div class="shop-tit">花卉宝</div>
+      <div>厦门市中花汇信息有限公司，成立于2015年，目前旗下有销花宝、花卉宝和花掌柜三个品牌，公司致力于帮助花店更轻松高效管理花店。</div>
     </div>
     <div class="list-content">
       <tui-list-view class="tui-list-view">
@@ -55,7 +55,7 @@
         >
           <div class="list-wrap">
             <div class="list-label">联系电话</div>
-            <div class="list-val">{{ shop.telephone || '18030142050' }}</div>
+            <div class="list-val">{{ shop.telephone || '15280215347' }}</div>
           </div>
           <div class="list-icon">
             <i
@@ -72,8 +72,8 @@
           class="tui-list"
         >
           <div class="list-wrap">
-            <div class="list-label">门店地址</div>
-            <div class="list-val">{{ shop.fullAddress || '暂无' }}</div>
+            <div class="list-label">公司地址</div>
+            <div class="list-val">厦门市软件园二期夜光汇2号楼521室</div>
           </div>
           <div class="list-icon">
             <i
@@ -112,16 +112,7 @@ export default {
       showGlInfo: 0,
       ad: [
         {
-          "img":`${this.$constant.imgUrl}/uploads/12358/202005/30/73ef244f75d985e5295c6481a693fd23.jpeg`
-        },
-        {
-          "img":`${this.$constant.imgUrl}/uploads/12358/202005/30/3bba7b038c37bf76332db788ce9bd6aa.jpeg`
-        },
-        {
-          "img":`${this.$constant.imgUrl}/uploads/12358/202005/30/7df62ab2bf506b3caeb3b946bb7c4653.jpeg`
-        },
-        {
-          "img":`${this.$constant.imgUrl}/uploads/12358/202005/30/e6ca9d6d4265674b79cc52579951fba3.jpeg`
+          "img":`${this.$constant.imgUrl}/logo2.jpg?v=5`          
         }]
     };
   },