merge

apis/interfaces/account.js

@@ -10,7 +10,6 @@ import { request } from '../index'
 
 // dt账户
 const dt = (data) =>{
-    console.log(data)
 	return request({
 		url: "user/account/dt_logs",
         data

manifest.json

@@ -2,7 +2,7 @@
     "name" : "共力生态",
     "appid" : "__UNI__DE7B0E6",
     "description" : "共力生态",
-    "versionName" : "1.0.25",
+    "versionName" : "1.0.26",
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */

pages/life/life.vue

@@ -43,7 +43,7 @@
 			<view class="life-flex-item house" @click="onNav({name: 'Store'}, 'tab')">
 				<view class="house-content">
 					<view class="house-title">DT商城</view>
-					<view class="house-subtitle">共力共慧</br>健康生活馆</view>
+					<view class="house-subtitle">共力共惠</br>健康生活馆</view>
 				</view>
 				<image src="../../static/img/house_back.jpg" mode="aspectFill"></image>
 			</view>

pages/order/index.vue

@@ -105,7 +105,6 @@
                     state: this.tabs[this.index].type,
                     page: this.page
                 }).then(res => {
-                    console.log(res);
                     if (res.page.current === 1) {
                         this.array = []
                     }

pages/user/index.vue

@@ -78,12 +78,12 @@
         <!-- 功能块 -->
 		<view class="btns-box" v-if="isWallet">
 			<view class="btns-box-item" @click="onBtn('AccountIntegral', {})">
-			    <image class="icon" src="@/static/user/userIcon_02.png" mode="widthFix" />
+			    <image class="icon" src="@/static/user/userIcon_10.png" mode="widthFix" />
 			    共力分钱包
 			    <uni-icons class="forward" type="forward" color="#999" />
 			</view>
 			<view class="btns-box-item" @click="onBtn('AccountDt', {})">
-			    <image class="icon" src="@/static/user/userIcon_02.png" mode="widthFix" />
+			    <image class="icon" src="@/static/user/userIcon_01.png" mode="widthFix" />
 			    DT积分钱包
 			    <uni-icons class="forward" type="forward" color="#999" />
 			</view>
@@ -149,7 +149,7 @@
 			<slot name="default">
 				<view class="mnemonic-pwass">
 					<input class="iv-input" :focus="true" type="password" v-model="iv" maxlength="10"
-						placeholder="输入密聊密码" />
+						placeholder="输入支付密码" />
 				</view>
 			</slot>
 		</u-modal>
@@ -282,6 +282,7 @@
 			// 退出登录
 			logOut() {
 				uni.removeStorageSync('isnew')
+				uni.removeStorageSync('isWalleNum')
 				this.$store.commit('setToken', '');
 				this.$Router.replaceAll({name: 'Auth'})
 			},