From 1659a6dc9d4e39c3270e1bf564fb419ddc2fd2cf Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 26 五月 2023 11:56:04 +0800
Subject: [PATCH] no message
---
uniapp/manifest.json | 4 ++--
uniapp/components/empowerModel.vue | 1 -
uniapp/pages/goods/shareGoods.vue | 19 ++++++++++++++-----
uniapp/components/colGoods.vue | 3 ++-
uniapp/pages/mine/elm.vue | 7 ++++---
uniapp/pages/login/wxlogin.vue | 2 ++
uniapp/pages/search/search.vue | 5 +++++
uniapp/pages/login/setInviteCode.vue | 16 ++++++++++++----
8 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/uniapp/components/colGoods.vue b/uniapp/components/colGoods.vue
index be1e0ba..b420329 100644
--- a/uniapp/components/colGoods.vue
+++ b/uniapp/components/colGoods.vue
@@ -46,7 +46,8 @@
搴楅摵锛歿{items.shopName}}
</view> -->
</view>
- <view class="shopname">{{items.shopName}}</view>
+
+ <!-- <view class="shopname">{{items.shopName}}</view> -->
</view>
</view>
</view>
diff --git a/uniapp/components/empowerModel.vue b/uniapp/components/empowerModel.vue
index 3777b39..1a75cfd 100644
--- a/uniapp/components/empowerModel.vue
+++ b/uniapp/components/empowerModel.vue
@@ -40,7 +40,6 @@
console.log(plug);
plug.login({}, result => {
- console.log(result);
var nick = result.userinfo.nick
if (result.code == 0) {
plug.taobaoOauth({
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index 521bf77..7cb85c4 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -59,14 +59,14 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
- "schemes" : "dafanguanapp"
+ "schemes" : ""
},
/* ios鎵撳寘閰嶇疆 */
"ios" : {
"idfa" : true,
"urltypes" : [
{
- "urlschemes" : [ "tbopen34348719", "dafanguanapp" ] //tbopen+鎮ㄥ簲鐢ㄧ殑AppKey
+ "urlschemes" : [ "tbopen34348719" ] //tbopen+鎮ㄥ簲鐢ㄧ殑AppKey
}
],
"urlschemewhitelist" : "tbopen,tmall",
diff --git a/uniapp/pages/goods/shareGoods.vue b/uniapp/pages/goods/shareGoods.vue
index 387fd1b..96d593f 100644
--- a/uniapp/pages/goods/shareGoods.vue
+++ b/uniapp/pages/goods/shareGoods.vue
@@ -310,13 +310,24 @@
var that = this;
if (goods.faction == 't') {
this.$u.api.getPrivilegeLink({type:0,goodsId:goods.goodsId}).then(e => {
+ console.log(e)
if(e.code == 1)return that.$alert(e.msg);
var res = e.data.info;
//that.Jumpurl = res.kuaiZhanUrl
that.tpwd = res.tpwd
var long = res.longTpwd
+ that.url = res.shortUrl;
+ if(that.url){
+ that.makeQRcode()
+ }else{
+ uni.showToast({
+ title:'鍒朵綔娴锋姤澶辫触锛�',
+ icon:'none'
+ })
+ }
//鑾峰彇杞摼鎺�
- that.$u.api.getPrivilegeShareLink({type:0,goodsId:goods.goodsId}).then(ed=>{
+ /* that.$u.api.getPrivilegeShareLink({type:0,goodsId:goods.goodsId}).then(ed=>{
+ console.log(ed)
if(ed.code == 1)return that.$alert(ed.msg);
var re = ed.data.list;
that.url = re.link;
@@ -329,7 +340,7 @@
})
}
}).catch(function (er) {
- })
+ }) */
}).catch(function (err) {
})
@@ -501,9 +512,7 @@
}
// APP涓嬭浇鍦板潃+閭�璇风爜
if (e === 3) {
- console.log(this.user)
- data = '銆愪笅杞介摼鎺ャ��' + this.appInfo.appAndroidDownUrl +
- '\n銆愰個璇风爜銆�' + this.user.invitation_code
+ data = this.appInfo.invite_url +"?code="+this.user.invitation_code
}
uni.setClipboardData({
data,
diff --git a/uniapp/pages/login/setInviteCode.vue b/uniapp/pages/login/setInviteCode.vue
index c76000c..3271537 100644
--- a/uniapp/pages/login/setInviteCode.vue
+++ b/uniapp/pages/login/setInviteCode.vue
@@ -48,11 +48,13 @@
isShowCode:false,
inviteCode:'',
appInfo:'',
- inviterShow:false
+ inviterShow:false,
+ platform:''
}
},
mounted() {
- this.appInfo = uni.getStorageSync('appInfo')
+ this.appInfo = uni.getStorageSync('appInfo');
+ this.platform = uni.getSystemInfoSync().platform
},
methods: {
useCode()
@@ -76,11 +78,17 @@
confirmText:'鑱旂郴鎺ㄨ崘浜�',
success:function(res)
{
+ console.log(that.platform);
+ console.log(res);
if (res.confirm) {
- that.isShowCode=true;
+ that.isShowCode=false;
} else if (res.cancel) {
- that.isShowCode=false;
+ that.isShowCode=true;
}
+ },
+ fail:function(res)
+ {
+ that.isShowCode=true;
}
});
},
diff --git a/uniapp/pages/login/wxlogin.vue b/uniapp/pages/login/wxlogin.vue
index 279d282..912d100 100644
--- a/uniapp/pages/login/wxlogin.vue
+++ b/uniapp/pages/login/wxlogin.vue
@@ -105,6 +105,8 @@
univerifyManager.close();
}).catch(err=>{
// 澶勭悊閿欒
+ console.log(err)
+ that.isother=true;
that.$alert('鑾峰彇鎵嬫満鍙风爜澶辫触锛岃浣跨敤鍏朵粬鏂瑰紡鐧诲綍')
setTimeout(function(){
univerifyManager.close();
diff --git a/uniapp/pages/mine/elm.vue b/uniapp/pages/mine/elm.vue
index 4067870..f851081 100644
--- a/uniapp/pages/mine/elm.vue
+++ b/uniapp/pages/mine/elm.vue
@@ -49,12 +49,12 @@
<image class="miniCodeImg" :src="wxQrcodeUrl" mode="aspectFit"></image>
<view class="getBtn-container rowCenCen" @tap="jumpMini()">
- <view>棰嗙孩鍖呯偣澶栧崠鈶�</view>
+ <view>棰嗙孩鍖呯偣澶栧崠</view>
</view>
- <view class="getBtn-container rowCenCen" @tap="jumpShangJinMini()">
+ <!-- <view class="getBtn-container rowCenCen" @tap="jumpShangJinMini()">
<view>棰嗗姞椁愮孩鍖呪憽</view>
- </view>
+ </view> -->
</view>
</view>
@@ -195,6 +195,7 @@
var that = this;
this.$u.api.eleShangjin({}).then(e => {
if(e.code != 0) return that.$alert(e.msg)
+ console.log(e)
uni.hideLoading()
uni.stopPullDownRefresh()
var res = e.data;
diff --git a/uniapp/pages/search/search.vue b/uniapp/pages/search/search.vue
index beda641..6e51803 100644
--- a/uniapp/pages/search/search.vue
+++ b/uniapp/pages/search/search.vue
@@ -207,6 +207,11 @@
}else{
this.storeCurrent = 0;
}
+ if(options.searchText)
+ {
+ this.searchText=options.searchText;
+ this.searchInput(null);
+ }
this.appinfo = getApp().globalData.appinfo.iosExamine;
this.platform = getApp().globalData.platform
this.getSearchFind();
--
Gitblit v1.9.3