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/rankinglist/common_act.vue | 78 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/uniapp/pages/rankinglist/common_act.vue b/uniapp/pages/rankinglist/common_act.vue
index f167e2f..e8f2b52 100644
--- a/uniapp/pages/rankinglist/common_act.vue
+++ b/uniapp/pages/rankinglist/common_act.vue
@@ -1,15 +1,27 @@
<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>
- var wv
+ import empowerModel from '../../components/empowerModel.vue'
+ var wv;
export default {
+ components: {
+ empowerModel
+ },
data() {
return {
+ webshow:true,
+ empowerModel: false,
webviewUrl: '',
+ user:'',
webviewStyles: {
progress: {
color: '#EE1B14'
@@ -25,7 +37,7 @@
}
else{
const value = uni.getStorageSync('userInfo');
- console.log(value);
+ this.user = value;
if(options.t_url)
{
this.webviewUrl = encodeURI(decodeURIComponent(options.t_url)+"?token="+value.token+"&userid="+value.id);
@@ -36,44 +48,42 @@
onReady() {
this.clearMuiBack();
},
+
methods: {
+
received(e) {
- console.log(e);
var res=e.detail.data[0];
- if(res.action=='target_tb')
+ console.log(res);
+ switch(res.action)
{
- this.getTbsrc(res.data.goodsId);
+ case "back":
+ this.backLast();
+ break;
+ case "tbauth":
+ this.openTbMd();
+ break;
}
},
- //璺宠浆娣樺疂
- getTbsrc(goodsid) {
+ backLast()
+ {
+ uni.navigateBack({
+ delta: 1
+ });
+ },
+ closeMdl() {
+ this.empowerModel = false;
+ this.webshow=true;
+ },
+ openTbMd()
+ {
+ this.webshow=false;
+ this.empowerModel = true
+ },
+ updataUser() {
var that = this;
- this.$u.api.getPrivilegeLink({
- goodsId: goodsid,
- type: 0
- }).then(e => {
- console.log(e);
- if (e.code != 0) return that.$alert(e.msg)
- var res = e.data.info;
- var tburl = res.shortUrl
- // #ifdef APP-PLUS
- if (plus.runtime.isApplicationExist({
- pname: 'com.taobao.taobao',
- action: 'taobao://'
- })) {
- const plug = uni.requireNativePlugin('xiguazhu-baichuan')
- plug.detailPage({
- url: tburl,
- "openType": 0
- }, result => {
- // console.log(result);
- });
- } else {
- uni.navigateTo({
- url: '../webView/webView?url=' + tburl
- })
- }
- // #endif
+ this.$u.api.getUserInfo({}).then(e => {
+ utils.setCache('userInfo', e.data.userinfo)
+ that.user = e.data.userinfo;
}).catch(function(err) {})
},
// 鍏抽棴mui杩斿洖
--
Gitblit v1.9.3