更改tabbar图标、修改个人中心部分排版

config/app.js

@@ -1,6 +1,7 @@
 
-// let domain = 'http://192.168.110.5:48080'
-let domain = 'https://5y413b7433.yicp.fun'
+let domain = 'http://192.168.110.185:48080'
+// let domain = 'https://5y413b7433.yicp.fun'
+// let domain = 'https://food.tjyyky.com'
 // let domain = 'http://127.0.0.1:48080'
 
 module.exports = {

pages/user/index.vue

@@ -77,7 +77,7 @@
 					</view>
 
 					<!-- 会员菜单 -->
-					<view class="user-menus" style="margin-top: 20rpx;">
+					<view class="user-menus" style="margin-top: 20rpx;" v-if="false">
 						<view class="menu-title">我的服务</view>
 						<view class="list-box">
 							<block v-for="(item,index) in menus" :key="index">
@@ -106,13 +106,17 @@
 					<view class="wallet-box">
 						<navigator url="/pages/users/user_money/index" hover-class="none">
 						    <view class="wallet acea-row row-between-wrapper" v-if="userInfo.mobile">
-						        <view>余额</view>
+								<view style="display: flex;align-items: center;">
+									<image src="../../static/img/yue.png" mode="widthFix" style="width: 36rpx;height: 27rpx;margin-right: 10rpx;"></image>
+									<view>余额</view>
+								</view>
+								
 						        <view class="input">
 						            {{ userInfo.nowMoney ? Number(userInfo.nowMoney).toFixed(2) : 0 }}<text class="iconfont icon-xiangyou"></text>
 						        </view>
 						    </view>
 						</navigator>
-						<navigator url="/pages/users/user_integral/index" hover-class="none">
+						<!-- <navigator url="/pages/users/user_integral/index" hover-class="none">
 						    <view class="wallet acea-row row-between-wrapper" v-if="userInfo.mobile">
 						        <view>积分</view>
 						        <view class="input">
@@ -128,16 +132,42 @@
 						            <text class="iconfont icon-xiangyou"></text>
 						        </view>
 						    </view>
+						</navigator> -->
+						<navigator url="/pages/users/user_address_list/index" hover-class="none">
+						    <view class="wallet acea-row row-between-wrapper" v-if="userInfo.mobile">
+						        <view style="display: flex;align-items: center;">
+						        	<image src="../../static/img/address.png" mode="widthFix" style="width: 36rpx;height: 27rpx;margin-right: 10rpx;"></image>
+						        	<view>我的地址</view>
+						        </view>
+						        <view class="input">
+						            <text class="iconfont icon-xiangyou"></text>
+						        </view>
+						    </view>
 						</navigator>
 						
 						<navigator url="/pages/users/user_goods_collection/index" hover-class="none">
 						    <view class="wallet acea-row row-between-wrapper" v-if="userInfo.mobile">
-						        <view>收藏</view>
+						        <view style="display: flex;align-items: center;">
+						        	<image src="../../static/img/collect.png" mode="widthFix" style="width: 36rpx;height: 27rpx;margin-right: 10rpx;"></image>
+						        	<view>我的收藏</view>
+						        </view>
 						        <view class="input">
 						            <text class="iconfont icon-xiangyou"></text>
 						        </view>
 						    </view>
 						</navigator>
+						
+						<!-- <navigator url="/pages/users/user_goods_collection/index" hover-class="none">
+						    <view class="wallet acea-row row-between-wrapper" v-if="userInfo.mobile">
+						        <view style="display: flex;align-items: center;">
+						        	<image src="../../static/img/collect.png" mode="widthFix" style="width: 36rpx;height: 27rpx;margin-right: 10rpx;"></image>
+						        	<view>客服中心</view>
+						        </view>
+						        <view class="input">
+						            <text class="iconfont icon-xiangyou"></text>
+						        </view>
+						    </view>
+						</navigator> -->
 					</view>
 					
 				<!-- 	<image src="/static/images/support.png" alt="" class='support' />
@@ -183,19 +213,19 @@
 					{
 						img: '/static/images/order2.png',
 						title: '待发货',
-						url: '/pages/users/order_list/index?status=1',
+						url: '/pages/users/order_list/index?status=10',
 						num: 0
 					},
 					{
 						img: '/static/images/order3.png',
 						title: '待收货',
-						url: '/pages/users/order_list/index?status=2',
+						url: '/pages/users/order_list/index?status=20',
 						num: 0
 					},
 					{
 						img: '/static/images/order4.png',
 						title: '待评价',
-						url: '/pages/users/order_list/index?status=3',
+						url: '/pages/users/order_list/index?status=30',
 						num: 0
 					},
 					{

pages/users/order_list/index.vue

@@ -17,19 +17,19 @@
           <view>全部</view>
           <view class='num'>{{ orderData.allCount || 0}}</view>
         </view>
-				<view class='item' :class='orderStatus === 0 ? "on": ""' @click="statusClick(0)">
+				<view class='item' :class='orderStatus == 0 ? "on": ""' @click="statusClick(0)">
 					<view>待付款</view>
 					<view class='num'>{{orderData.unpaidCount || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus === 10 ? "on": ""' @click="statusClick(10)">
+				<view class='item' :class='orderStatus == 10 ? "on": ""' @click="statusClick(10)">
 					<view>待发货</view>
 					<view class='num'>{{orderData.undeliveredCount || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus === 20 ? "on": ""' @click="statusClick(20)">
+				<view class='item' :class='orderStatus == 20 ? "on": ""' @click="statusClick(20)">
 					<view>待收货</view>
 					<view class='num '>{{orderData.deliveredCount || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus === 30 ? "on": ""' @click="statusClick(30, false)">
+				<view class='item' :class='orderStatus == 30 ? "on": ""' @click="statusClick(30, false)">
 					<view>待评价</view>
 					<view class='num'>{{orderData.uncommentedCount || 0}}</view>
 				</view>
@@ -154,8 +154,8 @@
 			 */
 			onLoad: function(options) {
 				if (options.status) {
-          this.orderStatus = options.status;
-        }
+				  this.orderStatus = options.status;
+				}
 			},
 			/**
 			 * 获取订单统计数据
@@ -169,6 +169,7 @@
        * 切换类型
        */
       statusClick: function(status, commentStatus) {
+		  console.log(status, this.orderStatus,'status === this.orderStatus')
         if (status === this.orderStatus) {
           return;
         }

utils/request.js

@@ -25,8 +25,13 @@ function deleteUndefinedProperties(obj) {
 }
 
 // 定义并存储域名变量
-const DOMAIN_KEY = 'CURRENT_DOMAIN';
-const DEFAULT_DOMAIN = 'https://5y413b7433.yicp.fun/';
+// const DOMAIN_KEY = 'https://food.tjyyky.com/';
+// const DOMAIN_KEY = 'https://5y413b7433.yicp.fun/';
+const DOMAIN_KEY = 'http://192.168.110.185:48080/';
+// const DOMAIN_KEY = 'CURRENT_DOMAIN';
+const DEFAULT_DOMAIN = 'http://192.168.110.185:48080/';
+// const DEFAULT_DOMAIN = 'https://5y413b7433.yicp.fun/';
+// const DEFAULT_DOMAIN = 'https://food.tjyyky.com/';
 
 // 检查缓存中是否已有域名，如果没有则设置默认域名
 if (!uni.getStorageSync(DOMAIN_KEY)) {