调整部分图片 修改商品详情按钮样式

components/tabBar/tabBar.vue

@@ -34,7 +34,7 @@
                "iconPath": "/static/imgs/caidanweixuanzhong.png",
                "selectedIconPath": "/static/imgs/caidanxuanzhong.png",
                "pagePath": "pages/menu/menu",
-               "text": "菜单"
+               "text": "主页"
              },
              {
                "iconPath": "/static/imgs/dingdanweixuanzhong.png",
@@ -110,7 +110,7 @@
 	}
  
 	.icon {
-		width: 40rpx;
-		height: 40rpx;
+		width: 50rpx;
+		height: 45rpx;
 	}
 </style>
\ No newline at end of file

menuSubPackage/pages/goodsDetail/goodsDetail.vue

@@ -123,12 +123,23 @@
           </div>
         </view>
         <view v-if="size > 0" class="good-select-cont">
+          <span
+            :class="
+              !shopState || !isInRange
+                ? 'good-select-btn1-close'
+                : 'good-select-btn1'
+            "
+            @click="shoppingCart"
+            type="default"
+            >加入购物袋</span
+          >
+
           <view>
             <a
               :class="
                 !shopState || !isInRange
-                  ? 'good-select-btn1-close'
-                  : 'good-select-btn1'
+                  ? 'good-select-btn2-close'
+                  : 'good-select-btn2'
               "
               @click="getallNum()"
               v-if="userms"
@@ -149,17 +160,6 @@
               立即购买
             </button>
           </view>
-
-          <span
-            :class="
-              !shopState || !isInRange
-                ? 'good-select-btn2-close'
-                : 'good-select-btn2'
-            "
-            @click="shoppingCart"
-            type="default"
-            >加入购物袋</span
-          >
         </view>
       </view>
     </view>
@@ -827,7 +827,7 @@ button[disabled]:not([type]) {
   border-radius: 2px;
   font-size: 28rpx;
   font-family: PingFangSC-Regular, PingFang SC;
-  background: #0050f6;
+  background: #1954ee;
   line-height: 104rpx;
   text-align: center;
   color: #fff;

mineSubPackage/pages/msg/index.vue

@@ -10,7 +10,7 @@
 					<view :style="{'text-align':'center'}">
 						<image class="empty_icon" src="/static/imgs/wuxiaoxizhanweitu.png"></image>
 					</view>
-					<view  class="empty_text">——暂无消息，去品尝杯咖啡吧——</view>
+					<view  class="empty_text">暂无消息，先去下单</view>
 					<button class="empty_button" @click="goHome">去品尝</button>
 				</view>
 				<view class="msg_item" v-for="item in list" @click="toRead(item)" :key="item.id">
@@ -120,7 +120,6 @@ export default {
 		 
 	}
 	.empty_text {
-		margin-top: 44rpx;
 		width: 414rpx;
 		text-align: center;
 		font-size: 24rpx;
@@ -129,7 +128,7 @@ export default {
 		color: #999999;
 	}
 	.empty_button {
-		margin-top: 35rpx;
+		margin-top: 50rpx;
 		width: 167rpx;
 		height: 64rpx;
 		border-radius: 2rpx;

pages/mine/mine.vue

@@ -148,7 +148,8 @@
     <view v-if="userms" class="function">
       <view class="title">常用功能</view>
       <view class="function_item">
-        <u-icon name="server-fill" color="#000000" size="16"></u-icon>
+        <!-- <u-icon name="server-fill" color="#000000" size="16"></u-icon> -->
+        <image class="icon_wechat" src="/static/imgs/ico_wechat.png"></image>
         <button
           class="function_item_text"
           open-type="contact"
@@ -182,11 +183,11 @@ export default {
       });
     }
     let platform = uni.getSystemInfoSync().platform;
-    if (platform == "android") {
+    // if (platform == "android") {
       this.img = "../../static/imgs/wodezhanweitu.png";
-    } else {
-      this.img = "https://s3.bmp.ovh/imgs/2022/07/05/1768111c5c7f5300.gif";
-    }
+    // } else {
+    //   this.img = "https://s3.bmp.ovh/imgs/2022/07/05/1768111c5c7f5300.gif";
+    // }
   },
   async onShow() {
     const dayTitleList = [
@@ -467,7 +468,7 @@ button::after {
     }
     .icon {
       width: 99.94rpx;
-      height: 110rpx;
+      height: 120rpx;
       margin: 0 auto;
     }
   }
@@ -614,6 +615,10 @@ button::after {
     display: flex;
     align-items: center;
     margin-top: 22rpx;
+    .icon_wechat {
+      width: 35rpx;
+      height: 35rpx;
+    }
 
     .function_item_text {
       flex: 1;

pages/order/order.vue

@@ -30,8 +30,8 @@
             src="/static/imgs/wudingdanzhanweitu.png"
           ></image>
         </view>
-        <view class="empty_text">——您还未下单，下单品尝一下吧——</view>
-        <button class="empty_button" @click="goHome">去品尝</button>
+        <view class="empty_text">没有订单，去买一杯</view>
+        <button class="empty_button" @click="goHome">下 单</button>
       </view>
       <view class="empty_notdl" v-show="!userms">
         <view :style="{ 'text-align': 'center' }">
@@ -40,13 +40,13 @@
             src="/static/imgs/weidengluzhanweitu.png"
           ></image>
         </view>
-        <view class="empty_text">——您还未登录，请先登录——</view>
+        <view class="empty_text">请先授权后登录</view>
         <button
           class="empty_button"
           open-type="getPhoneNumber"
           @getphonenumber="getPhoneNumber"
         >
-          去登录
+          登 录
         </button>
       </view>
       <view class="orders" :style="{ 'padding-bottom': orderBottom + 'rpx' }">
@@ -403,8 +403,6 @@ export default {
   }
   .empty_text {
     width: 500rpx;
-
-    margin-top: 32.73rpx;
     text-align: center;
 
     font-size: 24rpx;
@@ -413,7 +411,7 @@ export default {
     color: #999999;
   }
   .empty_button {
-    margin-top: 34.29rpx;
+    margin-top: 50rpx;
     width: 167rpx;
     height: 64rpx;
     border-radius: 2rpx;
@@ -421,6 +419,7 @@ export default {
     font-family: PingFangSC-Regular, PingFang SC;
     background: #0050f6;
     font-weight: 400;
+letter-spacing: 5rpx;
     color: #ffffff;
     line-height: 64rpx;
   }
@@ -442,7 +441,6 @@ export default {
     height: 236rpx;
   }
   .empty_text {
-    margin-top: 32rpx;
     text-align: center;
 
     font-size: 24rpx;
@@ -451,7 +449,7 @@ export default {
     color: #999999;
   }
   .empty_button {
-    margin-top: 36rpx;
+    margin-top: 50rpx;
     width: 167rpx;
     height: 64rpx;
     border-radius: 2rpx;
@@ -459,6 +457,7 @@ export default {
     font-family: PingFangSC-Regular, PingFang SC;
     background: #0050f6;
     font-weight: 400;
+letter-spacing: 5rpx;
     color: #ffffff;
     line-height: 64rpx;
   }