diff --git a/androidPrivacy.json b/androidPrivacy.json
index 51d98ce..92c7e9a 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,28 +1,29 @@
{
- "version" : "1",
- "prompt" : "template",
- "title" : "服务协议与隐私政策",
- "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r
-\t你可以阅读 《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
- "buttonAccept" : "同意并接受",
- "buttonRefuse" : "暂不同意",
- "second" : {
- "title" : "确认提示",
- "message" : "进入应用前，你需先同意《用户协议》 与 《隐私政策》，否则将退出应用。",
- "buttonAccept" : "同意并继续",
- "buttonRefuse" : "退出应用"
+ "version": "1",
+ "prompt": "template",
+ "title": "服务协议与隐私政策",
+ "message": "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\
+ t你可以阅读 < a href = \
+ "https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
+ "buttonAccept": "同意并接受",
+ "buttonRefuse": "暂不同意",
+ "second": {
+ "title": "确认提示",
+ "message": "进入应用前，你需先同意《用户协议》 与 《隐私政策》，否则将退出应用。",
+ "buttonAccept": "同意并继续",
+ "buttonRefuse": "退出应用"
+ },
+ "styles": {
+ "backgroundColor": "#fff",
+ "borderRadius": "5px",
+ "title": {
+ "color": "#000"
},
- "styles" : {
- "backgroundColor" : "#fff",
- "borderRadius" : "5px",
- "title" : {
- "color" : "#000"
- },
- "buttonAccept" : {
- "color" : "#fff"
- },
- "buttonRefuse" : {
- "color" : "#ccc"
- }
+ "buttonAccept": {
+ "color": "#fff"
+ },
+ "buttonRefuse": {
+ "color": "#ccc"
}
-}
+ }
+}
\ No newline at end of file
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index 5a2a73b..0704759 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -73,10 +73,10 @@
computed: mapGetters(['location']),
watch: {},
created() {
- const loca = JSON.parse(this.location)
- this.street = loca.address_component.street
this.getBanner()
this.Area()
+ const loca = JSON.parse(this.location)
+ this.street = loca.address_component.street
},
methods: {
selectLocation() {
diff --git a/config/app.js b/config/app.js
index d30dd89..cf87715 100644
--- a/config/app.js
+++ b/config/app.js
@@ -8,26 +8,26 @@ let httpApiTwo
let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' //测试
-// httpApi = 'https://shop.lihaink.cn' //生产
+httpApi = 'https://shop.lihaink.cn' //生产
// httpApi = 'http://192.168.0.222:8324' //生产
-// httpApiTwo = 'https://nk.lihaink.cn' //生产
+httpApiTwo = 'https://nk.lihaink.cn' //生产
-if (process.env.NODE_ENV === "development") {
- httpApi = "https://crmeb-test.shop.lihaink.cn"
- // #ifdef MP-WEIXIN
- httpApiTwo = "http://cms.com"
- httpApiThree = 'http://ceshi-oa.lihaink.cn'
- // #endif
- // #ifdef H5
- // httpApiTwo = "baseUrl" // h5跨域配置
- httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
- // httpApiThree = 'baseUrlTest' // h5跨域配置
- // #endif
-} else if (process.env.NODE_ENV === 'production') {
- httpApi = 'https://shop.lihaink.cn' // 生产
- httpApiTwo = 'https://nk.lihaink.cn' // 生产
- httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
-}
+// if (process.env.NODE_ENV === "development") {
+// httpApi = "https://crmeb-test.shop.lihaink.cn"
+// // #ifdef MP-WEIXIN
+// httpApiTwo = "http://cms.com"
+// httpApiThree = 'http://ceshi-oa.lihaink.cn'
+// // #endif
+// // #ifdef H5
+// // httpApiTwo = "baseUrl" // h5跨域配置
+// httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
+// // httpApiThree = 'baseUrlTest' // h5跨域配置
+// // #endif
+// } else if (process.env.NODE_ENV === 'production') {
+// httpApi = 'https://shop.lihaink.cn' // 生产
+// httpApiTwo = 'https://nk.lihaink.cn' // 生产
+// httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
+// }
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
// let wsApi = 'ws://192.168.3.20:8324'
diff --git a/manifest.json b/manifest.json
index e708746..0c46657 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "CRMEB",
- "appid" : "__UNI__5794595",
+ "appid" : "__UNI__3A527D1",
"description" : "",
"versionName" : "1.0.4",
"versionCode" : 127,
@@ -21,12 +21,10 @@
/* 模块配置 */
"modules" : {
"VideoPlayer" : {},
- "OAuth" : {},
- "Payment" : {},
- "Share" : {},
"iBeacon" : {},
"Geolocation" : {},
- "Maps" : {}
+ "Barcode" : {},
+ "Camera" : {}
},
"safearea" : {
"bottom" : {
@@ -38,25 +36,16 @@
/* android打包配置 */
"android" : {
"permissions" : [
- "",
- "",
"",
- "",
- "",
"",
"",
+ "",
"",
"",
"",
"",
- "",
- "",
- "",
- "",
- "",
"",
"",
- "",
"",
""
],
@@ -78,7 +67,8 @@
"NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
"NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
},
- "idfa" : false
+ "idfa" : false,
+ "dSYMs" : false
},
/* SDK配置 */
"sdkConfigs" : {
@@ -100,20 +90,13 @@
}
},
"geolocation" : {
- "amap" : {
- "__platform__" : [ "ios", "android" ],
- "appkey_ios" : "",
- "appkey_android" : ""
+ "system" : {
+ "__platform__" : [ "ios", "android" ]
}
},
"push" : {},
"oauth" : {
- "apple" : {},
- "weixin" : {
- "appid" : "",
- "appsecret" : "",
- "UniversalLinks" : "https://mer.crmeb.net/"
- }
+ "apple" : {}
},
"ad" : {}
},
@@ -158,7 +141,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wxfb4695444ab8d0d0",
+ "appid" : "wx6e14cb98394e36bc",
"setting" : {
"urlCheck" : false,
"minified" : true,
diff --git a/pages/home/index.vue b/pages/home/index.vue
index b8272b3..4e964cd 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -109,7 +109,6 @@
}
},
onLoad() {
- this.getBanner()
this.getCateList()
this.getGoods()
this.selfLocation()
@@ -229,7 +228,6 @@
},
},
onPullDownRefresh() {
- this.getBanner()
this.getCateList()
this.getGoods()
this.selfLocation()
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 7fa23b4..85d5759 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -73,8 +73,7 @@
+ class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>
+ class="pro-item" v-for="(itemn,indexn) in item.recommend.slice(0,3)" :key='indexn'>