From ea3df4a7c5e60fff7935eed4b07feebde8c4e723 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 30 六月 2023 09:06:27 +0800
Subject: [PATCH] Merge tag 'v1.1.3发布' into develop
---
uniapp/pages/search/searchResult.vue | 26 +++++---
uniapp/manifest.json | 4
uniapp/pages/rankinglist/fengqiang.vue | 2
uniapp/utils/config.js | 4
uniapp/pages/login/wxlogin.vue | 4
uniapp/pages/active/tmsearch.vue | 4
uniapp/pages/index/index.vue | 60 +++++++-------------
uniapp/pages/search/search.vue | 24 +++++---
uniapp/pages/login/setInviteCode.vue | 2
uniapp/pages/rankinglist/common_act.vue | 38 +++++++++++-
uniapp/components/rowGoods.vue | 2
11 files changed, 97 insertions(+), 73 deletions(-)
diff --git a/uniapp/components/rowGoods.vue b/uniapp/components/rowGoods.vue
index 2741ca8..d2dde21 100644
--- a/uniapp/components/rowGoods.vue
+++ b/uniapp/components/rowGoods.vue
@@ -17,7 +17,7 @@
<view class="cardbottom-container colCenEnd">
<view class="discounts-container rowCen borderBox">
- <view class="coupon-box rowCenCen" style="border: 1px solid #f50d49; color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
+ <view class="coupon-box rowCenCen" style="border: 1px solid #f50d49;width:auto;color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
<view>
{{items.sourceType=='wph'?items.discount+'鎶�':items.couponPrice+'鍏冨埜'}}
</view>
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index 0e3a85b..d97a230 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -2,8 +2,8 @@
"name" : "澶ц繑瀹�",
"appid" : "__UNI__FC8858A",
"description" : "澶ц繑瀹榓pp",
- "versionName" : "1.2.3",
- "versionCode" : 123,
+ "versionName" : "1.1.3",
+ "versionCode" : 113,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/uniapp/pages/active/tmsearch.vue b/uniapp/pages/active/tmsearch.vue
index a95608f..5dc18e4 100644
--- a/uniapp/pages/active/tmsearch.vue
+++ b/uniapp/pages/active/tmsearch.vue
@@ -1,5 +1,5 @@
<template>
- <view class="pddsearch-wrapper wrapperLayer borderBox" style="background: #fff;">
+ <view class="pddsearch-wrapper wrapperLayer borderBox">
<view class="topbarbox"></view>
<view class="fixed-container colCen">
<view class="topbarbox"></view>
@@ -65,7 +65,7 @@
<view class="scrangeList-container rowCen" :class="scrollTop>fiexdtop?'tofixed':''" :style="'top:'+(scrollTop>fiexdtop?fiexdHeight:'0')+'px;'">
<scroll-view class="scrollview-content" scroll-x scroll-with-animation="true">
<block v-for="(items,index) in secrendSearch" :key="index">
- <view class="rangeItem" :class="nowsec==items.id?'rangeItem-active':''" @tap="changeSeRange(items.id)">
+ <view class="rangeItem" style="font-size: 13px;margin-right: 30rpx; color: #8b8686;" :class="nowsec==items.id?'rangeItem-active':''" @tap="changeSeRange(items.id)">
<view class="boxcontent colCenCen">
<view class="nameBox">
{{items.name}}
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index a0b0e24..8b90c02 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -137,32 +137,10 @@
this.getPopBannerInfo();
},
onShow() {
- /* if(!this.hasLogin){
- setTimeout(function(){
-
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- } */
if(!this.hasshow)
{
this.shShow();
- }
-
- /* var user= uni.getStorageSync('userInfo');
- console.log(user); */
- // if(!user.invitation_code)
- // {
- // setTimeout(function(){
-
- // uni.reLaunch({
- // url:"/pages/login/wxlogin"
- // })
- // },1000);
- // return;
- // }
+ }
if(this.categoryList){
this.getCategoryList();
}
@@ -180,34 +158,38 @@
shShow()
{
var that=this;
+ var istoLogin=true;
this.$u.api.comminInt({}).then(e => {
that.hasshow=true;
// #ifdef APP-PLUS
if (plus.os.name == 'iOS') {
if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
that.isshowtype=true;
+ istoLogin=false;
} else {
that.isshowtype=false;
- console.log("璺宠浆");
- if(!that.hasLogin){
+ }
+ }
+ if(istoLogin)
+ {
+ if(!that.hasLogin){
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ }
+ /* var user= uni.getStorageSync('userInfo');
+ if(!user.invitation_code)
+ {
+ setTimeout(function(){
+
uni.reLaunch({
url:"/pages/login/wxlogin"
})
- }
- var user= uni.getStorageSync('userInfo');
- if(!user.invitation_code)
- {
- setTimeout(function(){
-
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- }
- }
- console.log(that.isshowtype);
+ },1000);
+ return;
+ } */
}
+
// #endif
}).catch(function(err) {
console.log(err);
diff --git a/uniapp/pages/login/setInviteCode.vue b/uniapp/pages/login/setInviteCode.vue
index 0a64ae0..66e25db 100644
--- a/uniapp/pages/login/setInviteCode.vue
+++ b/uniapp/pages/login/setInviteCode.vue
@@ -161,7 +161,7 @@
uni.switchTab({
url: '../index/index'
})
- */}
+ }*/
}).catch(function (err) {
console.log(err)
})
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 511649a..5a53652 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -202,11 +202,11 @@
url: './setInviteCode'
})
}
- else if (e.data.userinfo.isPwd == 'N') {
+ /* else if (e.data.userinfo.isPwd == 'N') {
uni.redirectTo({
url: './setPass'
})
- } else {
+ } */ else {
uni.switchTab({
url: '../index/index'
})
diff --git a/uniapp/pages/rankinglist/common_act.vue b/uniapp/pages/rankinglist/common_act.vue
index 27aba6e..e8f2b52 100644
--- a/uniapp/pages/rankinglist/common_act.vue
+++ b/uniapp/pages/rankinglist/common_act.vue
@@ -1,15 +1,24 @@
<template>
<view>
- <web-view :webview-styles="webviewStyles" :src="webviewUrl" @message='received'></web-view>
+ <web-view v-if="webshow" :webview-styles="webviewStyles" :src="webviewUrl" @message='received'></web-view>
+ <!-- taobao -->
+ <u-popup v-model="empowerModel" mode="center" border-radius="12">
+ <empowerModel @closemodel='closeMdl' @updataInfo='updataUser'></empowerModel>
+ </u-popup>
</view>
</template>
<script>
+ import empowerModel from '../../components/empowerModel.vue'
var wv;
export default {
+ components: {
+ empowerModel
+ },
data() {
return {
+ webshow:true,
empowerModel: false,
webviewUrl: '',
user:'',
@@ -31,7 +40,6 @@
this.user = value;
if(options.t_url)
{
- console.log(encodeURI(decodeURIComponent(options.t_url)+"?token="+value.token+"&userid="+value.id));
this.webviewUrl = encodeURI(decodeURIComponent(options.t_url)+"?token="+value.token+"&userid="+value.id);
}
}
@@ -45,9 +53,15 @@
received(e) {
var res=e.detail.data[0];
- if(res.action=='back')
+ console.log(res);
+ switch(res.action)
{
- this.backLast();
+ case "back":
+ this.backLast();
+ break;
+ case "tbauth":
+ this.openTbMd();
+ break;
}
},
backLast()
@@ -56,6 +70,22 @@
delta: 1
});
},
+ closeMdl() {
+ this.empowerModel = false;
+ this.webshow=true;
+ },
+ openTbMd()
+ {
+ this.webshow=false;
+ this.empowerModel = true
+ },
+ updataUser() {
+ var that = this;
+ this.$u.api.getUserInfo({}).then(e => {
+ utils.setCache('userInfo', e.data.userinfo)
+ that.user = e.data.userinfo;
+ }).catch(function(err) {})
+ },
// 鍏抽棴mui杩斿洖
clearMuiBack() {
// #ifdef APP-PLUS
diff --git a/uniapp/pages/rankinglist/fengqiang.vue b/uniapp/pages/rankinglist/fengqiang.vue
index 7a4bf27..bfff77a 100644
--- a/uniapp/pages/rankinglist/fengqiang.vue
+++ b/uniapp/pages/rankinglist/fengqiang.vue
@@ -48,7 +48,7 @@
else{
const value = uni.getStorageSync('userInfo');
console.log(value);
- this.webviewUrl = encodeURI('http://appapitest.ushopvip.com/html/fengqiangbang.html?token='+value.token);
+ this.webviewUrl = encodeURI('http://dfgapp.ushopvip.com/html/fengqiangbang.html?token='+value.token);
}
},
diff --git a/uniapp/pages/search/search.vue b/uniapp/pages/search/search.vue
index 6e51803..990c7ef 100644
--- a/uniapp/pages/search/search.vue
+++ b/uniapp/pages/search/search.vue
@@ -27,7 +27,7 @@
<view class="onlineStore-container rowCen" v-if="searchText==''">
<view class="onlineStoreList rowSta">
<block v-for="(items,index) in onlineStoreList" :key="index">
- <view class="store-items colCen" :class="storeCurrent==index?'store-items-active':''" @click="checkstore(index)">
+ <view class="store-items colCen" :class="storeCurrent==items.inde?'store-items-active':''" @click="checkstore(items.inde)">
<view class="store-name">
{{items.name}}
</view>
@@ -166,24 +166,30 @@
return {
onlineStoreList: [{
name: '娣樺疂',
- type: 'tb'
+ type: 'tb',
+ inde:0
},
{
name: '浜笢',
- type: 'jd'
+ type: 'jd',
+ inde:1
},
{
name: '鎷煎澶�',
- type: 'pdd'
- },
- {
- name: '鍞搧浼�',
- type: 'vph'
+ type: 'pdd',
+ inde:2
},
{
name: '鎶栭煶',
- type: 'dy'
+ type: 'dy',
+ inde:4
+ },
+ {
+ name: '鍞搧浼�',
+ type: 'vph',
+ inde:3
}
+
],
searchText: '',
storeCurrent: 0,
diff --git a/uniapp/pages/search/searchResult.vue b/uniapp/pages/search/searchResult.vue
index 650f64e..b9ad46e 100644
--- a/uniapp/pages/search/searchResult.vue
+++ b/uniapp/pages/search/searchResult.vue
@@ -23,8 +23,8 @@
<view class="onlineStore-container rowCen">
<view class="onlineStoreList rowSta" v-if="!showtar || platform!='iOS'">
<block v-for="(items,index) in onlineStoreList" :key="index">
- <view class="store-items colCen" :class="storeCurrent==index?'store-items-active':''"
- @click="checkstore(index)">
+ <view class="store-items colCen" :class="storeCurrent==items.inde?'store-items-active':''"
+ @click="checkstore(items.inde)">
<view class="store-name">
{{items.name}}
</view>
@@ -151,24 +151,30 @@
advertPic: '',
onlineStoreList: [{
name: '娣樺疂',
- type: 'tb'
+ type: 'tb',
+ inde:0
},
{
name: '浜笢',
- type: 'jd'
+ type: 'jd',
+ inde:1
},
{
name: '鎷煎澶�',
- type: 'pdd'
- },
- {
- name: '鍞搧浼�',
- type: 'wph'
+ type: 'pdd',
+ inde:2
},
{
name: '鎶栭煶',
- type: 'dy'
+ type: 'dy',
+ inde:4
+ },
+ {
+ name: '鍞搧浼�',
+ type: 'wph',
+ inde:3
}
+
],
sortList: [{
diff --git a/uniapp/utils/config.js b/uniapp/utils/config.js
index 8f94b03..567e57f 100644
--- a/uniapp/utils/config.js
+++ b/uniapp/utils/config.js
@@ -1,6 +1,6 @@
//const httpUrl = ""; // 鎺ュ彛鍩熷悕
-const httpUrl = "http://appapitest.ushopvip.com"; // 娴嬭瘯鐜鎺ュ彛鍩熷悕
-//const httpUrl = "http://dfgapp.ushopvip.com"; // 鐢熶骇鐜鎺ュ彛鍩熷悕
+//const httpUrl = "http://appapitest.ushopvip.com"; // 娴嬭瘯鐜鎺ュ彛鍩熷悕
+const httpUrl = "http://dfgapp.ushopvip.com"; // 鐢熶骇鐜鎺ュ彛鍩熷悕
const salt = "";
export default {
httpUrl:httpUrl,
--
Gitblit v1.9.3