diff --git a/App.vue b/App.vue
index 6743471..ad53463 100644
--- a/App.vue
+++ b/App.vue
@@ -204,11 +204,14 @@
}
// #endif
that.getConfigData();
- 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.audio(this.audioTeam[0])
- // this.audio('https://lihai001.oss-cn-chengdu.aliyuncs.com/app/out.wav')
- }, 1500)
+ // setTimeout(()=>{
+ // this.audioTeam = ['pay', 'five', 'qian', 'one', 'bai', 'six', 'shi', 'four', 'dian', 'three', 'two', 'yuan'];
+ // this.audioTeam = this.audioTeam.map(item=>{
+ // return `/static/audio/${item}.MP3`
+ // })
+ // 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('开始播放')
diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index 5058603..e3e93af 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -66,7 +66,11 @@
-
+
+
+
+ 暂无商品，看点别的吧
+
@@ -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;
+ }
+ }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 2cdf832..8fce855 100644
--- a/manifest.json
+++ b/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" : {
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
index 8dd5328..2b2e39b 100644
--- a/pages/cloud_warehouse/market/market.vue
+++ b/pages/cloud_warehouse/market/market.vue
@@ -361,7 +361,7 @@
{{item.mer_name}}
- 月销{{item.sales}}
+ 月销{{item.sales}}
@@ -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 = '定位失败'
+ })
+ }
+ })
+ },
}
}
\ No newline at end of file
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index f5bbdf5..3492c2e 100644
--- a/pages/gather/gather.vue
+++ b/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,
// 所有菜单的按钮
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 3d4306c..7da8c3e 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -257,10 +257,10 @@
-
+
0 && that.tabTitle[0]['value'] != '推荐') {
that.tabTitle.unshift({
diff --git a/pages/select_address_n/select_address_n.nvue b/pages/select_address_n/select_address_n.nvue
index 8ecb433..95520dd 100644
--- a/pages/select_address_n/select_address_n.nvue
+++ b/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;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 98ade27..f88f3bf 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -237,6 +237,7 @@
{{copyright.Copyright}}
备案号:蜀ICP备2022030133号-2A
增值电信营业许可证号:川B2-20221250
+ 联系我们：08302669767
{{appVersion}}
-
+
全部
-
+
1:9
-
+
2:8
-
+
3:7
-
+
4:6
-
+
+
+
+ 暂无商品，看点别的吧
+
@@ -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();
@@ -386,7 +424,7 @@
this.getProductslist();
},
methods: {
- changeDeduction(e){
+ changeDeduction(e) {
this.where.deduction_rate = e;
this.getProductslist(true);
},
@@ -480,7 +518,7 @@
store_category_id: ''
})
},
- getProductslist(reLoad = false, stop=false) {
+ getProductslist(reLoad = false, stop = false) {
if (reLoad) {
this.where.page = 1;
this.hostProduct = [];
@@ -489,7 +527,7 @@
if (this.isLoading == -1) return;
this.isLoading = 1;
getProductslist(this.where, true).then(res => {
- if(stop) uni.stopPullDownRefresh();
+ if (stop) uni.stopPullDownRefresh();
if (reLoad) this.hostProduct = [];
this.hostProduct = [...this.hostProduct, ...res.data.list];
this.isLoading = 0;
diff --git a/static/audio/1.MP3 b/static/audio/1.MP3
deleted file mode 100644
index 9ca8487..0000000
Binary files a/static/audio/1.MP3 and /dev/null differ
diff --git a/static/audio/2.MP3 b/static/audio/2.MP3
deleted file mode 100644
index 249d484..0000000
Binary files a/static/audio/2.MP3 and /dev/null differ
diff --git a/static/audio/3.MP3 b/static/audio/3.MP3
deleted file mode 100644
index 2aac4ad..0000000
Binary files a/static/audio/3.MP3 and /dev/null differ
diff --git a/static/audio/bai.MP3 b/static/audio/bai.MP3
index 3d35166..ad14b0f 100644
Binary files a/static/audio/bai.MP3 and b/static/audio/bai.MP3 differ
diff --git a/static/audio/dian.MP3 b/static/audio/dian.MP3
new file mode 100644
index 0000000..35b8dc5
Binary files /dev/null and b/static/audio/dian.MP3 differ
diff --git a/static/audio/eight.MP3 b/static/audio/eight.MP3
new file mode 100644
index 0000000..e306b81
Binary files /dev/null and b/static/audio/eight.MP3 differ
diff --git a/static/audio/five.MP3 b/static/audio/five.MP3
new file mode 100644
index 0000000..0f83668
Binary files /dev/null and b/static/audio/five.MP3 differ
diff --git a/static/audio/four.MP3 b/static/audio/four.MP3
new file mode 100644
index 0000000..716b7a5
Binary files /dev/null and b/static/audio/four.MP3 differ
diff --git a/static/audio/nine.MP3 b/static/audio/nine.MP3
new file mode 100644
index 0000000..cf68281
Binary files /dev/null and b/static/audio/nine.MP3 differ
diff --git a/static/audio/one.MP3 b/static/audio/one.MP3
new file mode 100644
index 0000000..81b5bad
Binary files /dev/null and b/static/audio/one.MP3 differ
diff --git a/static/audio/pay.MP3 b/static/audio/pay.MP3
new file mode 100644
index 0000000..3f90c2c
Binary files /dev/null and b/static/audio/pay.MP3 differ
diff --git a/static/audio/qian.MP3 b/static/audio/qian.MP3
new file mode 100644
index 0000000..8fd2bcd
Binary files /dev/null and b/static/audio/qian.MP3 differ
diff --git a/static/audio/seven.MP3 b/static/audio/seven.MP3
new file mode 100644
index 0000000..5d2a87f
Binary files /dev/null and b/static/audio/seven.MP3 differ
diff --git a/static/audio/shi.MP3 b/static/audio/shi.MP3
index 306a7c2..2c672c2 100644
Binary files a/static/audio/shi.MP3 and b/static/audio/shi.MP3 differ
diff --git a/static/audio/six.MP3 b/static/audio/six.MP3
new file mode 100644
index 0000000..afa354b
Binary files /dev/null and b/static/audio/six.MP3 differ
diff --git a/static/audio/three.MP3 b/static/audio/three.MP3
new file mode 100644
index 0000000..dceedc4
Binary files /dev/null and b/static/audio/three.MP3 differ
diff --git a/static/audio/two.MP3 b/static/audio/two.MP3
new file mode 100644
index 0000000..a477fa9
Binary files /dev/null and b/static/audio/two.MP3 differ
diff --git a/static/audio/wan.MP3 b/static/audio/wan.MP3
new file mode 100644
index 0000000..b2f0e92
Binary files /dev/null and b/static/audio/wan.MP3 differ
diff --git a/static/audio/wechat.MP3 b/static/audio/wechat.MP3
new file mode 100644
index 0000000..4e5f67e
Binary files /dev/null and b/static/audio/wechat.MP3 differ
diff --git a/static/audio/yi.MP3 b/static/audio/yi.MP3
new file mode 100644
index 0000000..c799dda
Binary files /dev/null and b/static/audio/yi.MP3 differ
diff --git a/static/audio/yuan.MP3 b/static/audio/yuan.MP3
index 6b9c2f6..64773d6 100644
Binary files a/static/audio/yuan.MP3 and b/static/audio/yuan.MP3 differ
diff --git a/static/audio/zero.MP3 b/static/audio/zero.MP3
new file mode 100644
index 0000000..00201f6
Binary files /dev/null and b/static/audio/zero.MP3 differ
diff --git a/static/audio/zhifubao.MP3 b/static/audio/zhifubao.MP3
deleted file mode 100644
index bc2838b..0000000
Binary files a/static/audio/zhifubao.MP3 and /dev/null differ
diff --git a/store/modules/storage.js b/store/modules/storage.js
index a04455f..8131d0e 100644
--- a/store/modules/storage.js
+++ b/store/modules/storage.js
@@ -17,7 +17,7 @@ const state = {
},
address: uni.getStorageSync('S_address') || {
street_id: '',
- townName: ''
+ townName: '未开启定位'
}
};
diff --git a/utils/uniMPfunction.js b/utils/uniMPfunction.js
index dcdc715..3d207f1 100644
--- a/utils/uniMPfunction.js
+++ b/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,