更新

App.vue

@@ -204,11 +204,14 @@
       }
       // #endif
       that.getConfigData();
-      setTimeout(()=>{
+      // setTimeout(()=>{
-        this.audioTeam = ['/static/audio/zhifubao.MP3','/static/audio/2.MP3','/static/audio/bai.MP3','/static/audio/1.MP3','/static/audio/shi.MP3','/static/audio/3.MP3', '/static/audio/yuan.MP3']
+      //   this.audioTeam = ['pay', 'five', 'qian', 'one', 'bai', 'six', 'shi', 'four', 'dian', 'three', 'two', 'yuan'];
-        this.audio(this.audioTeam[0])
+      //   this.audioTeam = this.audioTeam.map(item=>{
-        // this.audio('https://lihai001.oss-cn-chengdu.aliyuncs.com/app/out.wav')
+      //     return `/static/audio/${item}.MP3`
-      }, 1500)
+      //   })
+      //   this.audio(this.audioTeam[0])
+      //   // this.audio('https://lihai001.oss-cn-chengdu.aliyuncs.com/app/out.wav')
+      // }, 1500)
     },
     onShow() {
       let that = this
@@ -308,7 +311,7 @@
       async audio(url) {
       	const innerAudioContext = uni.createInnerAudioContext();
       	innerAudioContext.src = url || `/static/audio/order.mp3`;
-        innerAudioContext.startTime = 0.2;
+        innerAudioContext.startTime = 0;
       	innerAudioContext.autoplay = true;
       	innerAudioContext.onPlay(() => {
       		console.log('开始播放')

components/recommend/index.vue

@@ -66,7 +66,11 @@
 		</view>
 
 		<view class='recommendList' :class="indexP?'on':''">
-			<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" :sale_type="sale_type"/>
+			<WaterfallsFlow v-if="hostProduct.length>0" :wfList='hostProduct' @itemTap="goDetail" :type="0" :sale_type="sale_type"/>
+      <view class='pictrue' v-else>
+      	<image :src="`${domain}/static/images/noCart.png`"></image>
+      	<view>暂无商品，看点别的吧</view>
+      </view>
 		</view>
 	</view>
 </template>
@@ -126,7 +130,7 @@
 				domain: HTTP_REQUEST_URL,
 				tabsArr: [{
 					name: '全部',
-					desc: '猜你喜欢',
+					desc: '本地商品',
 					val: 1
 				}, {
 					name: '里海云仓',
@@ -363,4 +367,14 @@
     	}
     }
   }
+  .pictrue{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: #999;
+    image {
+      width: 414rpx;
+      height: 305rpx;
+    }
+  }
 </style>

manifest.json

@@ -75,7 +75,9 @@
                 },
                 "permissionPhoneState" : {
                     "request" : "none" //拨打电话权限关闭
-                }
+                },
+                "minSdkVersion" : 23,
+                "targetSdkVersion" : 30
             },
             /* ios打包配置 */
             "ios" : {
@@ -162,7 +164,7 @@
             },
             "splashscreen" : {
                 "useOriginalMsgbox" : true,
-                "androidStyle" : "default"
+                "androidStyle" : "common"
             }
         },
         "nativePlugins" : {

pages/cloud_warehouse/market/market.vue

@@ -361,7 +361,7 @@
         <view class="content">
           <view class="content-head">
             <view class="title">{{item.mer_name}}</view>
-            <text style="font-size: 21.03rpx;color: #aaa;">月销{{item.sales}}</text>
+            <text style="font-size: 21.03rpx;color: #aaa;" v-if="item.sales>=100">月销{{item.sales}}</text>
           </view>
           <view class="content-two">
             <view class="score">
@@ -400,6 +400,9 @@
     goShopDetail
   } from '@/libs/order.js'
   import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+  import {
+    getGeocoder
+  } from "@/api/store.js"
   import {
     merClassifly,
     storeMerchantList
@@ -413,6 +416,7 @@
   import {
     HTTP_REQUEST_URL
   } from '@/config/app';
+import { Toast } from '../../../libs/uniApi';
   export default {
     components: {
       WaterfallsFlow
@@ -447,8 +451,13 @@
       }, mapGetters(['viewColor', 'keyColor'])),
     },
     onLoad(option) {
-      this.where.location = `${this.$store.state.storage.location.lat},${this.$store.state.storage.location.long}`;
       this.street = this.$store.state.storage.address.townName;
+      if(this.$store.state.storage.location.lat) {
+        this.where.location = `${this.$store.state.storage.location.lat},${this.$store.state.storage.location.long}`;
+      } else if(uni.getStorageSync('getAddress')){
+        this.street = '';
+        this.getLocation();
+      } else Toast('点击右上角开启定位后才可获取附近商家')
       this.merClassifly();
       this.storeMerchantList();
     },
@@ -540,6 +549,41 @@
       		}
       	})
       },
+      getLocation(){
+        uni.getLocation({
+          type: 'gcj02',
+          success: (res) => {
+            let latitude, longitude;
+            latitude = res.latitude.toString();
+            longitude = res.longitude.toString();
+            this.$store.commit('setLocation', {
+            	lat: res.latitude.toFixed(6),
+            	long: res.longitude.toFixed(6),
+            });
+            getGeocoder({
+            	lat: latitude,
+            	long: longitude
+            }).then(res => {
+            	let town = res.data.address_reference.town.title
+            	let street_id = street_id = res.data.address_reference.town.id
+            	this.street = res.data.address_reference.town.title;
+            	this.$store.commit('setAddress', {
+            		street_id: street_id,
+            		townName: town
+            	});
+            	uni.$emit('getLocation_succees', {
+                street_id,
+              })
+            }).catch(err => {
+            	uni.showToast({
+            		title: err,
+            		icon: 'none'
+            	})
+            	this.street = '定位失败'
+            })
+          }
+        })
+      },
     }
   }
 </script>

pages/gather/gather.vue

@@ -272,7 +272,6 @@
         prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
         isShow: false,
         isFshow: false,
-        street: '',
         // 编辑中标记
         editFlag: false,
         // 所有菜单的按钮

pages/goods_details/index.vue

@@ -257,10 +257,10 @@
                     <!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red ml8 bt-color">{{storeInfo.merchant.type_name}}</text>
 										<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8 bt-color">自营</text> -->
                   </view>
-                  <view v-if="storeInfo.merchant.care_count" class="txt">
+                  <!-- <view v-if="storeInfo.merchant.care_count" class="txt">
                     {{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
                   </view>
-                  <view v-else class="txt">0人关注</view>
+                  <view v-else class="txt">0人关注</view> -->
                 </navigator>
                 <navigator v-if="hide_mer_status != 1"
                   :url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`" class="link"

pages/index/component/homeComb.vue

@@ -131,7 +131,7 @@
 				isCategory: false,
 				swiperTop: 0,
 				isFixed: true,
-				street: ''
+				street: '未开启定位'
 			};
 		},
 		watch: {
@@ -191,7 +191,7 @@
 			})
 		},
 		mounted() {
-      this.getLocation();
+      this.street = this.$store.state.storage.address.townName;
 			let that = this;
 			if (that.tabTitle.length > 0 && that.tabTitle[0]['value'] != '推荐') {
 				that.tabTitle.unshift({

pages/select_address_n/select_address_n.nvue

@@ -236,8 +236,8 @@
         })
       },
       submitAddress() {
-        console.log(this.locationInfo);
         try {
+          uni.setStorageSync('getAddress', true);
           this.town = this.locationInfo.address_reference.town.title;
           this.street_id = this.locationInfo.address_reference.town.id;
           this.street = this.locationInfo.address_reference.town.title;

pages/user/index.vue

@@ -237,6 +237,7 @@
 				<view class="text">{{copyright.Copyright}}</view>
 				<view class="">备案号:蜀ICP备2022030133号-2A</view>
 				<view class="">增值电信营业许可证号:川B2-20221250</view>
+				<view class="">联系我们：08302669767</view>
         <view style="padding-top: 50rpx;">{{appVersion}}</view>
 			</view>
 			<!-- <view v-else class="copy-right">

pages/users/user_address/index.vue

@@ -289,7 +289,7 @@
 				});
 				if (uni.getStorageSync('RejectTarget')) return
 				uni.getLocation({
-					type: 'wgs84',
+					type: 'gcj02',
 					success: (res) => {
             res = wgsToGcj(res);
 						let latitude, longitude;

pages/whole_sale/index.vue

@@ -197,6 +197,16 @@
       }
     }
   }
+  .pictrue{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: #999;
+    image {
+      width: 414rpx;
+      height: 305rpx;
+    }
+  }
 </style>
 <template>
   <view class="wholeSale">
@@ -272,7 +282,10 @@
       <view class="comprehensive">
         <view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
           <text>价格</text>
-          <image src="@/static/new_define/priceChange.png"></image>
+          <image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;"
+            :src="where.order == 'price_desc' ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
+          </image>
+          <view v-else style="width: 15rpx;height: 21rpx;"></view>
         </view>
         <view class="comprehensive-sales_num" :class="{'comp-color': orderCurr==2}" @click="toOrder('sales', 2)">
           <text>销量</text>
@@ -288,26 +301,35 @@
       </view>
       <!-- 综合查询 -->
       <view class="comprehensive" v-if="deduction_rate">
-        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate==''}" @click="changeDeduction('')">
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate==''}"
+          @click="changeDeduction('')">
           <text>全部</text>
         </view>
-        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='10'}" @click="changeDeduction('10')">
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='10'}"
+          @click="changeDeduction('10')">
           <text>1:9</text>
         </view>
-        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='15'}" @click="changeDeduction('15')">
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='15'}"
+          @click="changeDeduction('15')">
           <text>2:8</text>
         </view>
-        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='20'}" @click="changeDeduction('20')">
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='20'}"
+          @click="changeDeduction('20')">
           <text>3:7</text>
         </view>
-        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='25'}" @click="changeDeduction('25')">
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='25'}"
+          @click="changeDeduction('25')">
           <text>4:6</text>
         </view>
       </view>
 
       <!-- 流水瀑布 -->
       <WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" :sale_type="2" />
-      <loadmore :type="isLoading" style="padding: 40rpx 0 150rpx; 0"></loadmore>
+      <loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 40rpx 0 150rpx; 0"></loadmore>
+      <view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
+      	<image :src="`${domain}/static/images/noCart.png`"></image>
+      	<view>暂无商品，看点别的吧</view>
+      </view>
     </view>
 
     <!--自定义底部tab栏-->
@@ -329,6 +351,15 @@
     getVersion,
     getNavigation
   } from "@/api/public";
+  import {
+    configMap
+  } from "@/utils"
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    HTTP_REQUEST_URL
+  } from '@/config/app';
   import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
   export default {
     components: {
@@ -337,6 +368,7 @@
     },
     data() {
       return {
+        domain: HTTP_REQUEST_URL,
         tabsArr: [{
           name: '里海云仓批发',
           val: 1
@@ -371,6 +403,12 @@
         }
       }
     },
+    computed: {
+      ...configMap({
+        margin_ico_switch: 0,
+        margin_ico: '',
+      }, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
+    },
     onLoad() {
       this.getNav();
       this.getStoreCategory();

store/modules/storage.js

@@ -17,7 +17,7 @@ const state = {
   },
   address: uni.getStorageSync('S_address') || {
     street_id: '',
-    townName: ''
+    townName: '未开启定位'
   }
 };
 

utils/uniMPfunction.js

@@ -5,7 +5,7 @@ export const test = () => {
 export const uniMPgetLocation = () => {
   return new Promise((resolve, reject) => {
     uni.getLocation({
-      type: 'wgs84',
+      type: 'gcj02',
       geocode: true,
       isHighAccuracy: true,
       // altitude: true,