Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

yudao-ui-app/config/app.js

@@ -1,5 +1,7 @@
 
 let domain = process.env.APP_BASE_URL
+// let domain = 'http://192.168.1.188:48080'
+// let domain = 'http://api.cyywl.top'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名

yudao-ui-app/pages/index/index.vue

@@ -15,8 +15,10 @@
 						</view>
 					</view>
 					<view class="right">
-						<view class="up"></view>
+						<view class="up">
-						<text>会员等级3级</text>
+							<image style="width: ;" src="@/static/images/shop/vip_oneStar.png" mode=""></image>
+						</view>
+						<text>会员等级1级</text>
 						<view class="button">查看权益</view>
 					</view>
 				</view>
@@ -753,9 +755,12 @@
 					flex-wrap: wrap;
 					align-items: center;
 					.up {
-						width: 90rpx;
+						width: 110rpx;
-						height: 100rpx;
+						height: 110rpx;
-						background: #EE5423;
+						image {
+							width: 101rpx;
+							height: 110rpx;
+						}
 					}
 					text {
 						font-size: 22rpx;

yudao-ui-app/pages/users/order_list/index.vue

@@ -112,7 +112,7 @@
 				page: 1,
 				list1: [{
 					name: '全部',
-					value: ''
+					value: '99'
 				}, {
 					name: '待付款',
 					value: '0'