更新

hdApp/src/admin/home/mall.vue

@@ -19,7 +19,7 @@
               <view class="red-mind" v-if="unReadMsgNum>0">{{ unReadMsgNum>9?'9+':unReadMsgNum }}</view>
             </view>
             <view class="hero-icon-btn" @click="scanCode">
-              <image class="hero-action-icon" :src="iconSrc('general-scan')" mode="aspectFit" />
+              <image class="hero-action-icon" :src="iconSrc('close-shop')" mode="aspectFit" />
             </view>
           </view>
         </view>
@@ -580,8 +580,8 @@ export default {
 }
 
 .hero-actions .hero-action-icon {
-  width: 37upx;
-  height: 37upx;
+  width: 39upx;
+  height: 39upx;
 }
 /* #endif */
 
@@ -609,8 +609,8 @@ export default {
 }
 
 .hero-action-icon {
-  width: 46upx;
-  height: 46upx;
+  width: 48upx;
+  height: 48upx;
 }
 
 .title-icon-img {

hdApp/src/admin/home/order.vue

@@ -152,7 +152,7 @@
             @click.stop="$util.pageTo({ url: '/admin/order/itemOrder?ids=' + item.sameTimeIds })"
           >
             <image class="merge-icon" :src="iconSrc('order-tongzhi')" mode="aspectFit" />
-            <text>本客户共有{{ item.sameTimeIdsNum || 0 }}个订单，可合并发货</text>
+            <view class="merge-tip-text">客户共有{{ item.sameTimeIdsNum || 0 }}个订单，点击查看</view>
             <text class="merge-arrow">›</text>
           </view>
 
@@ -1077,11 +1077,11 @@ export default {
 
 .pickup-tag {
   display: inline-block;
-  margin-top: 10upx;
+  margin-top: 20upx;
   padding: 3upx 10upx;
-  border: 1upx solid #4ae299;
+  border: 1upx solid #45b880;
   border-radius: 8upx;
-  color: #4ae299;
+  color: #45b880;
   font-size: 24upx;
   font-weight: 700;
   flex-shrink: 0;
@@ -1147,14 +1147,22 @@ export default {
   font-weight: 700;
 }
 
-.merge-tip text:nth-child(2) {
+.merge-tip-text {
   flex: 1;
+  min-width: 0;
   margin-left: 12upx;
+  line-height: 38upx;
+  font-size: 28upx;
+  font-weight: 700;
+  color: #079e49;
 }
 
 .merge-arrow {
-  font-size: 46upx;
-  line-height: 1;
+  flex-shrink: 0;
+  margin-left: 8upx;
+  font-size: 36upx;
+  line-height: 38upx;
+  height: 38upx;
 }
 
 .action-row {
@@ -1167,7 +1175,7 @@ export default {
 
 .outline-action,
 .solid-action {
-  min-height: 66upx;
+  min-height: 70upx;
   padding: 0 22upx;
   border-radius: 12upx;
   display: flex;
@@ -1238,9 +1246,10 @@ export default {
 }
 
 .merge-icon {
-  width: 24upx;
-  height: 24upx;
-  margin-right: 10upx;
+  width: 38upx;
+  height: 38upx;
+  flex-shrink: 0;
+  align-self: center;
 }
 
 .action-icon {

hdApp/src/admin/home/workbench.vue

@@ -86,7 +86,11 @@
               </view>
               <view class="function-item function-item--overlay" @click="goMore()">
                 <image class="function-icon" :src="iconSrc('stock-deleted-wholesaler')" mode="aspectFit" />
-                <text class="function-text function-text--overlay function-text--sm">已删批发店</text>
+                <text class="function-text function-text--overlay function-text--sm">已删门店</text>
+              </view>
+              <view class="function-item function-item--overlay" @click="goMore()">
+                <image class="function-icon" :src="iconSrc('open-shop')" mode="aspectFit" />
+                <text class="function-text function-text--overlay function-text--sm">申请开店</text>
               </view>
             </view>
           </view>