From fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 15:18:06 +0800
Subject: [PATCH] Merge branch 'feature/1.1.4开发' into develop
---
uniapp/pages/mine/mt.vue | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/uniapp/pages/mine/mt.vue b/uniapp/pages/mine/mt.vue
index e9b8719..dc06dd6 100644
--- a/uniapp/pages/mine/mt.vue
+++ b/uniapp/pages/mine/mt.vue
@@ -1,9 +1,9 @@
<template>
<view class="elm-wrapper wrapperLayer"
- :style="optionsCurrent==2?'background-color:#62BC00;':'background-color:#FFD100;'">
+ :style="optionsCurrent==2?'background-color:#FFD100;':'background-color:#FFD100;'">
<view class="flexbox borderBox colCen"
- :style="optionsCurrent==2?'background-color:#62BC00;':'background-color:#FFD100;'">
+ :style="optionsCurrent==2?'background-color:#FFD100;':'background-color:#FFD100;'">
<view class="topbarbox"></view>
<view class="leftimgbox rowCenBet" @tap="back()">
<view class="shadow rowCenCen" style="background:rgba(0,0,0,0);">
@@ -21,8 +21,8 @@
</view>
<view class="options-bar-content rowCenCen">
- <view class="center-container rowCenBet">
- <block v-for="(items,index) in optionsList" :key="index">
+ <view class="center-container rowCenBet">
+ <block v-for="(items,index) in optionsList" :key="index">
<view class="items-content rowCenCen" @tap="navTap(items.type)" :class="{ 'yellow':items.type == optionsCurrent && [1,3].includes(optionsCurrent), 'green': items.type == optionsCurrent && optionsCurrent ==2 }">
<view>{{items.label}}</view>
</view>
@@ -55,16 +55,15 @@
瑙勫垯璇存槑锛�
</view>
<view class="richtext-content">
- 1.鏈娲诲姩涓孩鍖呴鍙栨椂闂存埅姝㈣嚦2021骞�12鏈�31鏃�24鐐�;</br>
- 2.姝ゆ椿鍔ㄤ负閮ㄥ垎鍖哄煙鏈夋晥锛屼互娲诲姩椤甸潰瀹為檯灞曠ず涓哄噯;绾㈠寘鍙戞斁鏁伴噺鍙婄孩鍖呴噾棰濆叿鏈夐殢鏈烘��;鍏蜂綋绾㈠寘浣跨敤鏈夋晥鏈熷強绾㈠寘閲戦浠ュ疄闄呮敹鍒颁负鍑�;</br>
- 3.绾㈠寘浣跨敤瑙勫垯:</br>
+ 1.姝ゆ椿鍔ㄤ负閮ㄥ垎鍖哄煙鏈夋晥锛屼互娲诲姩椤甸潰瀹為檯灞曠ず涓哄噯;绾㈠寘鍙戞斁鏁伴噺鍙婄孩鍖呴噾棰濆叿鏈夐殢鏈烘��;鍏蜂綋绾㈠寘浣跨敤鏈夋晥鏈熷強绾㈠寘閲戦浠ュ疄闄呮敹鍒颁负鍑�;</br>
+ 2.绾㈠寘浣跨敤瑙勫垯:</br>
(1)绾㈠寘浣跨敤闂ㄦ銆佷娇鐢ㄦ湡闄愬強浣跨敤瑙勫垯绛変互绾㈠寘鍒搁潰灞曠ず淇℃伅涓哄噯;</br>
(2)绾㈠寘鍙湪缇庡洟鎴栫編鍥㈠鍗栨渶鏂扮増瀹㈡埛绔�佺編鍥㈠鍗栧皬绋嬪簭涓嬪崟涓旈�夋嫨鍦ㄧ嚎鏀粯鏃朵娇鐢�;涓旂孩鍖呬粎闄愰潪鍒板簵鑷彇澶栧崠璁㈠崟锛屼笅鍗堣尪銆佸瀹点�佺編椋熴�佽泲绯曘�佸洟椁愰閬撱�佺敎鐐�
楗搧棰戦亾浣跨敤; </br>
(3)澶栧崠鏂颁汉棣栧崟绾㈠寘闄愭柊鐢ㄦ埛(璁惧銆佹墜鏈哄彿銆� 绾㈠寘
鍙峰潎鏈湪缇庡洟澶栧崠涓嬭繃鍗�)棣栨涓嬪崟浣跨敤锛屼笖涓嶄笌鍏朵粬浼樻儬(棣栧噺銆佹弧鍑忋�佹弧璧犮�佸椁愬銆佹姌鎵ｈ彍)鍚屼韩;闈為鍗曠孩鍖呭彲涓庝笂杩颁紭鎯犲彔鍔犱娇鐢�;</br>
(4)浣跨敤绾㈠寘鏃朵笅鍗曟墜鏈哄彿鐮佸繀椤讳笌鏀堕浜烘墜鏈哄彿鐮併�侀鍙栫孩鍖呮椂杈撳叆鐨勬墜鏈哄彿鐮佷竴鑷�:</br>
- 4.璁㈠崟璺熷崟瑙勫垯涓烘偍閫氳繃鏈椿鍔ㄩ〉鐐瑰嚮璺宠浆鑷崇編鍥㈠悗鍙浜х敓鏈夋晥鐐瑰嚮鍗冲彲杩涜璺熷崟锛岀偣鍑绘湁鏁堟湡鏈�闀夸负7澶�</br>
+ 3.璁㈠崟璺熷崟瑙勫垯涓烘偍閫氳繃鏈椿鍔ㄩ〉鐐瑰嚮璺宠浆鑷崇編鍥㈠悗鍙浜х敓鏈夋晥鐐瑰嚮鍗冲彲杩涜璺熷崟锛岀偣鍑绘湁鏁堟湡鏈�闀夸负7澶�</br>
</view>
</view>
</view>
@@ -77,16 +76,21 @@
optionsCurrent: 1,
scrollTop: 0,
optionsList: [{
- label: "澶栧崠",
+ label: "缇庡洟",
type: 1
},
+ {
+ label: "楗夸簡涔�",
+ type: 2
+ }
+ /* ,
{
label: "鍟嗚秴",
type: 2
}, {
label: "浼橀��",
type: 3
- }
+ } */
],
mtInfo: null,
wxQrcodeUrl: ''
@@ -125,6 +129,7 @@
this.$u.api.meituanAct({type:this.optionsCurrent}).then(e => {
if(e.code != 0)return that.$alert(e.msg)
uni.stopPullDownRefresh()
+ console.log(e)
that.mtInfo = e.data.info;
that.wxQrcodeUrl = that.mtInfo.we_app_info.miniCode;
}).catch(function (err) {
@@ -138,7 +143,14 @@
navTap(type) {
if (this.optionsCurrent != type) {
this.optionsCurrent = type
- if (this.optionsCurrent == 2) {
+ if(this.optionsCurrent==2)
+ {//璺宠浆楗夸簡涔�
+ uni.redirectTo({
+ url:'./elm'
+ })
+ return;
+ }
+ else if (this.optionsCurrent == 2) {
uni.setNavigationBarColor({
frontColor: '#ffffff',
backgroundColor: '#62BC00'
@@ -241,10 +253,10 @@
.options-bar-content {
width: 100%;
- margin-top: 168rpx;
+ margin-top: 198rpx;
.center-container {
position: relative;
- width: 360rpx;
+ width: 240rpx;
height: 58rpx;
background: rgba(254, 254, 254, 0.3);
border-radius: 29rpx;
--
Gitblit v1.9.3