diff --git a/androidPrivacy.json b/androidPrivacy.json
index 812ca90..6d16ed9 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,27 +1,27 @@
{
- "version": "1",
- "prompt": "template",
- "title": "服务协议与隐私政策",
- "message": "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志、OAID等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\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"
+ "version" : "1",
+ "prompt" : "template",
+ "title" : "服务协议与隐私政策",
+ "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志、OAID等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\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" : "退出应用"
},
- "buttonAccept": {
- "color": "#fff"
- },
- "buttonRefuse": {
- "color": "#ccc"
+ "styles" : {
+ "backgroundColor" : "#fff",
+ "borderRadius" : "5px",
+ "title" : {
+ "color" : "#000"
+ },
+ "buttonAccept" : {
+ "color" : "#fff"
+ },
+ "buttonRefuse" : {
+ "color" : "#ccc"
+ }
}
- }
-}
\ No newline at end of file
+}
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index 9547437..800db19 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -104,9 +104,12 @@
this.isSelectPlace ? this.showPicker = true : ''
},
confirm(e) {
- this.street = e.value[1].name
+ this.street = e.value[1].name
this.showPicker = false
this.$emit('selectPlce', e)
+ let adress = Cache.get('LOCATION_DATA',true)
+ adress.address_component.street=e.value[1].name
+ Cache.set('LOCATION_DATA',adress)
},
changeHandler(e) {
const {
diff --git a/manifest.json b/manifest.json
index d162001..cfbfae5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,6 +35,7 @@
"distribute": {
/* android打包配置 */
"android": {
+ "resizeableActivity": true,
"permissions": [
"",
"",
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index f0f7b98..ad41366 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -3,7 +3,7 @@
-
+
市级供应链
@@ -103,7 +103,7 @@
-
+
@@ -197,6 +197,7 @@
mer_id: '',
userInfoData: { mer_info: { type_id: 0 } },
prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
+ isShow:false
};
},
computed: {
@@ -228,7 +229,14 @@
let that = this;
getUserInfo().then(res => {
that.userInfoData = res.data;
- this.mer_id = res.data.service.mer_id
+ console.log(res.data.service);
+ if(res.data.service == null){
+ // console.log('123');
+ this.isShow=false
+ }else{
+ this.isShow=true
+ this.mer_id = res.data.service.mer_id
+ }
if (!res.data.mer_info) {
that.$set(this, 'jurisdiction', false);
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index df8b372..144314a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -184,6 +184,7 @@
})
},
getGoods: function(item) {
+ console.log(item);
graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index 40d52a3..796e569 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -84,7 +84,7 @@
-