Merge branch 'master' of http://git.excellentkk.cn/C.C/nk-shop2.0

androidPrivacy.json

@@ -1,27 +1,27 @@
 {
-  "version": "1",
+    "version" : "1",
-  "prompt": "template",
+    "prompt" : "template",
-  "title": "服务协议与隐私政策",
+    "title" : "服务协议与隐私政策",
-  "message": "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志、OAID等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>\r\r\t你可以阅读 < a href = \"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》</a> 与 <a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_userr_privacy\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
+    "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志、OAID等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。<br/>\r\r\t你可以阅读 < a href = \"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》</a> 与 <a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_userr_privacy\">《隐私政策》</a>了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。",
-  "buttonAccept": "同意并接受",
+    "buttonAccept" : "同意并接受",
-  "buttonRefuse": "暂不同意",
+    "buttonRefuse" : "暂不同意",
-  "second": {
+    "second" : {
-    "title": "确认提示",
+        "title" : "确认提示",
-    "message": "进入应用前，你需先同意<a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》</a> 与 <a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_userr_privacy\">《隐私政策》</a>，否则将退出应用。",
+        "message" : "进入应用前，你需先同意<a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_user_agree\">《用户协议》</a> 与 <a href=\"https://shop.lihaink.cn/pages/users/user_about/index?from=sys_userr_privacy\">《隐私政策》</a>，否则将退出应用。",
-    "buttonAccept": "同意并继续",
+        "buttonAccept" : "同意并继续",
-    "buttonRefuse": "退出应用"
+        "buttonRefuse" : "退出应用"
     },
-  "styles": {
+    "styles" : {
-    "backgroundColor": "#fff",
+        "backgroundColor" : "#fff",
-    "borderRadius": "5px",
+        "borderRadius" : "5px",
-    "title": {
+        "title" : {
-      "color": "#000"
+            "color" : "#000"
         },
-    "buttonAccept": {
+        "buttonAccept" : {
-      "color": "#fff"
+            "color" : "#fff"
         },
-    "buttonRefuse": {
+        "buttonRefuse" : {
-      "color": "#ccc"
+            "color" : "#ccc"
         }
     }
 }

components/zbpSwiper.vue

@@ -107,6 +107,9 @@
         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 {

manifest.json

@@ -35,6 +35,7 @@
     "distribute": {
       /* android打包配置 */
       "android": {
+		   "resizeableActivity": true,
         "permissions": [
           "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
           "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",

pages/gather/gather.vue

@@ -3,7 +3,7 @@
     <zbpSwiper></zbpSwiper>
     <u-empty :show="jurisdiction" marginTop="260" mode="permission" :text="emptyText"
       icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
-    <block v-if="isLogin">
+    <block v-if="isShow">
       <!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
       <view class="special_work com" v-if="true">
         <view class="title">市级供应链</view>
@@ -103,7 +103,7 @@
           </view>
         </view>
 
-        <gatherBusiness :userInfoData="userInfoData" />
+        <!-- <gatherBusiness :userInfoData="userInfoData" /> -->
       </view>
 
       <!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
@@ -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;
+		  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);
           }

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'

pages/product/addGoods/index.vue

@@ -84,7 +84,7 @@
 					</view>
 				</view>
 
-				<view class="popup_group_item" @click="selectBrand">
+		<!-- 		<view class="popup_group_item" @click="selectBrand">
 					<view class="popup_group_item_label">商品品牌</view>
 					<view class="popup_group_item_value">
 						<view class="popup_group_item_message">
@@ -94,7 +94,7 @@
 						</view>
 						<view><text class="iconfont">&#xe6bd;</text></view>
 					</view>
-				</view>
+				</view> -->
 
 				<view class="popup_group_item">
 					<view class="popup_group_item_label">商品单位</view>
@@ -407,7 +407,6 @@
 			}
 		},
 		onShow() {
-			this.setFormData.store_name = ''
 			this.setFormData.setSpecificaValue = '';
 			this.setFormData.setSpecificaValue2 = '';
 			if (getStorage('singleSpecification')) {

store/modules/app.js

@@ -20,6 +20,7 @@ const state = {
 
 const mutations = {
   setLocation(state, data) {
+	  console.log(data);
     state.location = data
     Cache.set('LOCATION_DATA', data);
   },