From 83e49ed8b1ab05dd332def0fba6c3703d1e91373 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 11 八月 2023 16:32:28 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.5开发' into develop
---
uniapp/pages/mine/elm.vue | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/uniapp/pages/mine/elm.vue b/uniapp/pages/mine/elm.vue
index 4067870..5c09515 100644
--- a/uniapp/pages/mine/elm.vue
+++ b/uniapp/pages/mine/elm.vue
@@ -1,8 +1,8 @@
<template>
<view class="elm-wrapper wrapperLayer"
- :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#62BC00;'">
+ :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#1088FE;'">
<view class="flexbox borderBox colCen"
- :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#62BC00;'">
+ :style="optionsCurrent==3?'background-color:#1088FE;':'background-color:#1088FE;'">
<view class="topbarbox"></view>
<view class="leftimgbox rowCenBet" @tap="back()">
<view class="shadow rowCenCen" style="background:rgba(0,0,0,0);">
@@ -22,7 +22,7 @@
<view class="center-container rowCenBet">
<block v-for="(items,index) in optionsList" :key="index">
<view class="items-content rowCenCen"
- :style="optionsCurrent==items.type?items.type==3?'color:#1088FE;':'color:#62BC00;':''"
+ :style="optionsCurrent==items.type?items.type==3?'color:#1088FE;':'#1088FE;':''"
@tap="navTap(items.type,index)">
<view>{{items.label}}</view>
</view>
@@ -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>
@@ -85,16 +85,22 @@
data() {
return {
optionsCurrent: 3,
- activeIndex: 0, // 褰撳墠閫変腑鐨刬ndex
+ activeIndex: 1, // 褰撳墠閫変腑鐨刬ndex
scrollTop: 0,
- optionsList: [{
- label: "澶栧崠",
- type: 3
+ optionsList: [
+ {
+ label: "缇庡洟",
+ type: 0
},
{
+ label: "楗夸簡涔�",
+ type: 3
+ },
+
+ /* {
label: "鏋滆敩",
type: 5
- }
+ } */
],
pageInfo: null,
wxQrcodeUrl: '',
@@ -132,7 +138,14 @@
if (this.optionsCurrent != type) {
this.optionsCurrent = type
this.activeIndex = index
- if (this.optionsCurrent == 5) {
+ if(this.optionsCurrent == 0)
+ {
+ uni.redirectTo({
+ url:'./mt'
+ })
+ return;
+ }
+ /* else if (this.optionsCurrent == 5) {
uni.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: '#62BC00'
@@ -143,12 +156,13 @@
backgroundColor: '#1088FE'
})
}
- this.IntiData()
+ this.IntiData() */
}
},
jumpMini() {
var isAppletJump = getApp().globalData.appinfo.isAppletJump;
if(isAppletJump){
+ console.log('isAppletJump')
var appId = this.pageInfo.app_id;
var appPath = this.pageInfo.wx_miniprogram_path;
plus.share.getServices(function(res) {
@@ -159,6 +173,7 @@
sweixin = t;
}
}
+ console.log(sweixin)
if (sweixin) {
sweixin.launchMiniProgram({
id: appId,
@@ -175,6 +190,7 @@
pname: 'com.taobao.taobao',
action: 'taobao://'
})) {
+ console.log('tb')
const plug = uni.requireNativePlugin('xiguazhu-baichuan')
plug.detailPage({
url: this.pageInfo.click_url,
@@ -183,6 +199,7 @@
// console.log(result);
});
} else {
+ console.log('webview')
uni.navigateTo({
url: '../webView/webView?url=' +this.pageInfo.click_url,
})
@@ -195,6 +212,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;
@@ -258,7 +276,7 @@
.options-bar-content {
width: 100%;
- margin-top: 168rpx;
+ margin-top: 198rpx;
.center-container {
position: relative;
--
Gitblit v1.9.3