From 77c95fc3bf3bea844c8f722f9828086a7fb14422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Sat, 26 Nov 2022 12:56:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=BA=90?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/manifest.json                |  14 +-
 template/uni-app/pages.json                   | 175 +++++++++---------
 .../uni-app/pages/annex/special/index.vue     |   6 +-
 .../pages/columnGoods/HotNewGoods/index.vue   |   7 +-
 .../uni-app/pages/goods_cate/goods_cate.vue   |  11 +-
 .../uni-app/pages/goods_cate/goods_cate1.vue  |  12 +-
 template/uni-app/pages/index/diy/index.vue    |   9 +-
 template/uni-app/pages/index/index.vue        |   1 +
 .../pages/order_addcart/order_addcart.vue     |  19 +-
 template/uni-app/pages/user/index.vue         |  15 +-
 10 files changed, 112 insertions(+), 157 deletions(-)

diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index 87b6b0a1e..31fdae590 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -2,8 +2,8 @@
     "name" : "CRMEB标准版",
     "appid" : "__UNI__A3F1ED4",
     "description" : "CRMEB标准版",
-    "versionName" : "4.6.0",
-    "versionCode" : 460,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -63,12 +63,7 @@
             "ios" : {
                 "capabilities" : {
                     "entitlements" : {
-                        "com.apple.developer.associated-domains" : [
-                            "applinks:",
-                            "applinks:",
-                            "applinks:",
-                            "applinks:static-679f0930-8f60-425c-9033-8c135f397ea5.bspapp.com"
-                        ]
+                        "com.apple.developer.associated-domains" : [ "applinks:", "applinks:", "applinks:" ]
                     }
                 },
                 "privacyDescription" : {
@@ -79,8 +74,7 @@
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSCameraUsageDescription" : "上传用户头像保存分享海报"
                 },
-                "idfa" : false,
-                "dSYMs" : false
+                "idfa" : false
             },
             /* SDK配置 */
             "sdkConfigs" : {
diff --git a/template/uni-app/pages.json b/template/uni-app/pages.json
index ca4be113a..79dc1f428 100644
--- a/template/uni-app/pages.json
+++ b/template/uni-app/pages.json
@@ -71,95 +71,93 @@
 		}
 		//#endif
 	],
-	"subPackages": [
-		{
+	"subPackages": [{
 			"root": "pages/extension",
 			"name": "extension",
-			"pages": [
-			{
-				"path": "customer_list/chat",
-				"style": {
-					"navigationBarTitleText": "对话详情",
-					"navigationStyle": "custom",
-					"app-plus": {
-						"scrollIndicator": false //禁用原生导航栏
+			"pages": [{
+					"path": "customer_list/chat",
+					"style": {
+						"navigationBarTitleText": "对话详情",
+						"navigationStyle": "custom",
+						"app-plus": {
+							"scrollIndicator": false //禁用原生导航栏
+								// #ifdef APP-PLUS
+								,
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						},
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "news_list/index",
+					"style": {
+						"navigationBarTitleText": "资讯",
+						"app-plus": {
 							// #ifdef APP-PLUS
-							,
-						"titleNView": {
-							"type": "default"
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
 						}
-						// #endif
-					},
-					"disableScroll": true
-				}
-			},
-			{
-				"path": "news_list/index",
-				"style": {
-					"navigationBarTitleText": "资讯",
-					"app-plus": {
-						// #ifdef APP-PLUS
-						"titleNView": {
-							"type": "default"
+					}
+				},
+				{
+					"path": "news_details/index",
+					"style": {
+						"navigationBarTitleText": "资讯详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
 						}
-						// #endif
 					}
 				}
-			},
-			{
-				"path": "news_details/index",
-				"style": {
-					"navigationBarTitleText": "资讯详情",
-					"app-plus": {
-						// #ifdef APP-PLUS
-						"titleNView": {
-							"type": "default"
-						}
-						// #endif
-					}
-				}
-			}
-		]
+			]
 		}, {
 			"root": "pages/goods",
 			"name": "goods",
 			"pages": [{
-				"path": "goods_list/index",
-				"style": {
-					"navigationBarTitleText": "商品列表",
-					"app-plus": {
-						// #ifdef APP-PLUS
-						"titleNView": {
-							"type": "default"
+					"path": "goods_list/index",
+					"style": {
+						"navigationBarTitleText": "商品列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
 						}
-						// #endif
 					}
-				}
-			}, {
-				"path": "goods_search/index",
-				"style": {
-					"navigationBarTitleText": "搜索商品",
-					"app-plus": {
-						// #ifdef APP-PLUS
-						"titleNView": {
-							"type": "default"
+				}, {
+					"path": "goods_search/index",
+					"style": {
+						"navigationBarTitleText": "搜索商品",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
 						}
-						// #endif
 					}
-				}
-			}, {
-				"path": "order_pay_status/index",
-				"style": {
-					"navigationBarTitleText": "支付成功",
-					"app-plus": {
-						// #ifdef APP-PLUS
-						"titleNView": {
-							"type": "default"
+				}, {
+					"path": "order_pay_status/index",
+					"style": {
+						"navigationBarTitleText": "支付成功",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
 						}
-						// #endif
 					}
-				}
-			}, {
+				}, {
 					"path": "admin_order_detail/index",
 					"style": {
 						"navigationBarTitleText": "订单详情",
@@ -316,7 +314,7 @@
 							// #endif
 						}
 					}
-				},{
+				}, {
 					"path": "order_refund_goods/index",
 					"style": {
 						"navigationBarTitleText": "退回商品",
@@ -328,7 +326,8 @@
 							// #endif
 						}
 					}
-				}]
+				}
+			]
 		}, {
 			"root": "pages/users",
 			"name": "users",
@@ -410,7 +409,7 @@
 							// #endif
 						}
 					}
-				}, 
+				},
 				{
 					"path": "scan_login/index",
 					"style": {
@@ -501,17 +500,17 @@
 					}
 				},
 				{
-				  "path": "visit_list/index",
-				  "style": {
-				    "navigationBarTitleText": "浏览记录",
-				    "app-plus": {
-				      // #ifdef APP-PLUS
-				      "titleNView": {
-				        "type": "default"
-				      }
-				      // #endif
-				    }
-				  }
+					"path": "visit_list/index",
+					"style": {
+						"navigationBarTitleText": "浏览记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+				  		"type": "default"
+							}
+							// #endif
+						}
+					}
 				},
 				{
 					"path": "user_goods_collection/index",
@@ -905,7 +904,7 @@
 						}
 					}
 				},
-			  {
+				{
 					"path": "payment_on_behalf/index",
 					"style": {
 						"navigationBarTitleText": "好友代付",
@@ -1273,7 +1272,7 @@
 					"style": {
 						"navigationBarTitleText": "精彩内容"
 					}
-				}	
+				}
 			]
 		},
 		{
diff --git a/template/uni-app/pages/annex/special/index.vue b/template/uni-app/pages/annex/special/index.vue
index 175e2bae0..161623df5 100644
--- a/template/uni-app/pages/annex/special/index.vue
+++ b/template/uni-app/pages/annex/special/index.vue
@@ -41,7 +41,7 @@
 				<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
 				{{ loadTitle }}
 			</view>
-			<view class="foot" v-if="newData.menuList && footerStatus">
+			<view class="foot" v-if="newData.menuList && newData.status.status">
 				<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 					<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
 						@click="goRouter(item)">
@@ -183,7 +183,6 @@
 				sortMpTop: 0,
 				newData: {},
 				activeRouter: '',
-				footerStatus: false,
 				bgColor: '',
 				bgPic: '',
 				bgTabVal: '',
@@ -353,7 +352,7 @@
 			// 对象转数组
 			objToArr(data) {
 				console.log(data)
-				if(!data) return
+				if (!data) return
 				const keys = Object.keys(data)
 				keys.sort((a, b) => a - b)
 				const m = keys.map(key => data[key]);
@@ -391,7 +390,6 @@
 							that.$store.commit('FOOT_UPLOAD', item)
 							arr.splice(index, 1)
 							this.newData = item
-							this.footerStatus = item.status.status
 						}
 						if (item.name == 'promotionList') {
 							that.numConfig = item.numConfig.val;
diff --git a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
index 0d94e7645..1fef974d4 100644
--- a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
+++ b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
@@ -27,7 +27,7 @@
 		<!-- #ifndef MP -->
 		<home></home>
 		<!-- #endif -->
-		<pageFooter v-if="footerStatus"></pageFooter>
+		<pageFooter></pageFooter>
 	</div>
 </template>
 <script>
@@ -69,14 +69,9 @@
 				page: 1,
 				limit: 8,
 				isScroll: true,
-				footerStatus: false
 			};
 		},
 		onLoad: function(option) {
-			if (uni.getStorageSync('FOOTER_BAR')) {
-				this.footerStatus = true
-				uni.hideTabBar()
-			}
 			this.type = option.type;
 			this.titleInfo();
 			this.name = option.name;
diff --git a/template/uni-app/pages/goods_cate/goods_cate.vue b/template/uni-app/pages/goods_cate/goods_cate.vue
index 418351b0e..ce4024033 100644
--- a/template/uni-app/pages/goods_cate/goods_cate.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate.vue
@@ -44,11 +44,7 @@
 			if (this.status == 2 || this.status == 3) {
 				uni.hideTabBar();
 			} else if (this.status == 1) {
-				if (!this.is_diy) {
-					uni.hideTabBar();
-				} else {
-					this.$refs.classOne.getNav();
-				}
+				this.$refs.classOne.getNav();
 			}
 		},
 		methods: {
@@ -79,9 +75,8 @@
 					} else {
 						if (!this.is_diy) {
 							uni.hideTabBar()
-						} else {
-							this.$refs.classOne.getNav();
-						}
+						} else {}
+						this.$refs.classOne.getNav();
 					}
 				})
 			}
diff --git a/template/uni-app/pages/goods_cate/goods_cate1.vue b/template/uni-app/pages/goods_cate/goods_cate1.vue
index 9a4cc11f5..407b13694 100644
--- a/template/uni-app/pages/goods_cate/goods_cate1.vue
+++ b/template/uni-app/pages/goods_cate/goods_cate1.vue
@@ -53,8 +53,8 @@
 				</scroll-view>
 			</view>
 		</view>
-		<tabBar v-if="!is_diy" :pagePath="'/pages/goods_cate/goods_cate'"></tabBar>
-		<view class="foot" v-else-if="is_diy && newData.status && newData.status.status">
+		<!-- <tabBar v-if="!is_diy" :pagePath="'/pages/goods_cate/goods_cate'"></tabBar> -->
+		<view class="foot" v-if="newData.menuList && newData.menuList.length">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
@@ -114,7 +114,6 @@
 				// #ifdef APP-PLUS
 				pageHeight: app.globalData.windowHeight,
 				// #endif
-				footerStatus: false,
 				lock: false
 			}
 		},
@@ -136,13 +135,6 @@
 			let curRoute = routes[routes.length - 1].route
 			this.activeRouter = '/' + curRoute
 			this.getAllCategory();
-			// if (uni.getStorageSync('FOOTER_BAR')) {
-			// 	this.footerStatus = true
-			// 	uni.hideTabBar()
-			// 	getNavigation().then(res => {
-			// 		this.newData = res.data
-			// 	})
-			// }
 
 
 		},
diff --git a/template/uni-app/pages/index/diy/index.vue b/template/uni-app/pages/index/diy/index.vue
index 3b3bdb18d..754f57e33 100644
--- a/template/uni-app/pages/index/diy/index.vue
+++ b/template/uni-app/pages/index/diy/index.vue
@@ -141,12 +141,12 @@
 				<!-- #endif -->
 				<couponWindow :window="isCouponShow" @onColse="couponClose" :couponImage="couponObj.image"
 					:couponList="couponObj.list"></couponWindow>
-				<view class="uni-p-b-98" v-if="footerStatus"></view>
+				<view class="uni-p-b-98"></view>
 				<!-- #ifndef MP -->
 				<view v-if="site_config" class="site-config" @click="goICP">{{ site_config }}</view>
 				<!-- #endif -->
 				<!-- <pageFooter v-if="footerStatus"></pageFooter> -->
-				<view class="foot" v-if="newData.status && newData.status.status">
+				<view class="foot">
 					<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 						<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
 							@click="goRouter(item)">
@@ -361,7 +361,6 @@
 				site_config: '',
 				errorNetwork: false, // 是否断网
 				privacyStatus: false, // 隐私政策是否同意过
-				footerStatus: false,
 				isHeaderSerch: false,
 				bgColor: '',
 				bgPic: '',
@@ -715,10 +714,6 @@
 							console.log(item.status)
 							if (item.status && item.status.status) {
 								this.newData = item
-								setTimeout((e) => {
-									that.$set(that, 'footerStatus', true);
-									console.log(this.footerStatus)
-								}, 50)
 							}
 							uni.setStorageSync('FOOTER_BAR', item.status && item.status.status ? true :
 								false)
diff --git a/template/uni-app/pages/index/index.vue b/template/uni-app/pages/index/index.vue
index 3283c2522..a9e5febb2 100644
--- a/template/uni-app/pages/index/index.vue
+++ b/template/uni-app/pages/index/index.vue
@@ -23,6 +23,7 @@
 			visualization
 		},
 		onShow() {
+			uni.hideTabBar()
 			uni.$on('is_diy', (data) => {
 				this.isDiy = data
 			})
diff --git a/template/uni-app/pages/order_addcart/order_addcart.vue b/template/uni-app/pages/order_addcart/order_addcart.vue
index 27f16e79f..3cdf66168 100644
--- a/template/uni-app/pages/order_addcart/order_addcart.vue
+++ b/template/uni-app/pages/order_addcart/order_addcart.vue
@@ -144,8 +144,8 @@
 		<!-- <view class="uni-p-b-96"></view> -->
 		<view class="uni-p-b-98"></view>
 		<!-- <pageFooter :countNum="cartCount"></pageFooter> -->
-		<tabBar v-if="!is_diy" :pagePath="'/pages/order_addcart/order_addcart'"></tabBar>
-		<view class="foot" v-else-if="is_diy && newData.status && newData.status.status">
+		<!-- <tabBar v-if="!is_diy" :pagePath="'/pages/order_addcart/order_addcart'"></tabBar> -->
+		<view class="foot" v-if="newData.menuList && newData.menuList.length">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
@@ -266,18 +266,9 @@
 		computed: mapGetters(['isLogin']),
 		onLoad(options) {
 			uni.hideTabBar()
-			if (this.is_diy) {
-				if (uni.getStorageSync('FOOTER_BAR')) {
-					uni.hideTabBar()
-				} else {
-					this.is_diy_set = true
-				}
-				getNavigation().then(res => {
-					this.newData = res.data
-				})
-			} else {
-				uni.hideTabBar()
-			}
+			getNavigation().then(res => {
+				this.newData = res.data
+			})
 			let that = this;
 			if (that.isLogin == false) {
 				toLogin();
diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue
index 19d1ee72f..9f97b9a73 100644
--- a/template/uni-app/pages/user/index.vue
+++ b/template/uni-app/pages/user/index.vue
@@ -272,8 +272,8 @@
 				<view class="uni-p-b-98"></view>
 			</scroll-view>
 		</view>
-		<tabBar v-if="!is_diy" :pagePath="'/pages/user/index'"></tabBar>
-		<view class="foot" v-else-if="is_diy && newData.status && newData.status.status">
+		<!-- <tabBar v-if="!is_diy" :pagePath="'/pages/user/index'"></tabBar> -->
+		<view class="foot" v-if="newData.menuList && newData.menuList.length">
 			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
 				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
 					<block v-if="item.link == activeRouter">
@@ -412,14 +412,9 @@
 		onLoad(option) {
 			uni.hideTabBar()
 			let that = this;
-			if (this.is_diy) {
-				if (uni.getStorageSync('FOOTER_BAR')) {
-					uni.hideTabBar()
-				}
-				getNavigation().then(res => {
-					this.newData = res.data
-				})
-			}
+			getNavigation().then(res => {
+				this.newData = res.data
+			})
 			// #ifdef MP
 			// 小程序静默授权
 			if (!this.$store.getters.isLogin) {