Merge branch 'master' into redesign‌-260706

ghsApp/src/admin/home/components/OrderItem.vue

@@ -87,7 +87,12 @@
             <i class="iconfont iconxiangyou"></i>
           </view>
         </view>
-        <view class="order-info_box remark-box" v-if="!$util.isEmpty(item.remark)">
+        <!-- 点击备注区域编辑，阻止冒泡避免进入订单详情 -->
+        <view
+          class="order-info_box remark-box remark-box--editable"
+          v-if="!$util.isEmpty(item.remark)"
+          @click.stop="openRemarkEdit(item)"
+        >
           <view class="remark-text">{{ item.remark }}</view>
         </view>
         <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1 && moreOrderRemind == true" class="merge-tips" @click.stop="pageTo({ url: '/admin/order/mergeOrder?ids=' + item.sameTimeIds+'&mergeId='+item.mergeId })" >
@@ -103,56 +108,56 @@
               :data-order-id="item.id"
               :data-share-type="shareBtnType"
               @click.stop="shareOrder(item)"
-              class="admin-button-com bule"
+              class="admin-button-com bule list-btn--compact"
             >分享</button>
           </view>
           <!-- #endif -->
           <!-- #ifdef APP-PLUS -->
           <view class="list-button-item">
-            <button @click.stop="shareOrder(item)" class="admin-button-com bule">分享</button>
+            <button @click.stop="shareOrder(item)" class="admin-button-com bule list-btn--compact">分享</button>
           </view>
           <!-- #endif -->
           <!-- #ifndef MP-WEIXIN -->
           <!-- #ifndef APP-PLUS -->
           <view class="list-button-item">
-            <button @click.stop="shareOrder(item)" class="admin-button-com bule">分享</button>
+            <button @click.stop="shareOrder(item)" class="admin-button-com bule list-btn--compact">分享</button>
           </view>
           <!-- #endif -->
           <!-- #endif -->
           <block v-if="currentStatus == 2">
             <block v-if="item.book == 0">
-              <view class="list-button-item"><button @click.stop="directFh(item)" class="admin-button-com bule">发货</button> </view>
+              <view class="list-button-item"><button @click.stop="directFh(item)" class="admin-button-com bule list-btn--compact">发货</button> </view>
             </block>
             <block v-else>
-              <view class="list-button-item"><button @click.stop="confirmFh(item)" class="admin-button-com bule">发货</button> </view>
+              <view class="list-button-item"><button @click.stop="confirmFh(item)" class="admin-button-com bule list-btn--compact">发货</button> </view>
             </block>
           </block>
           <block v-else>
-            <view class="list-button-item"><button disabled="true" class="admin-button-com bule active">发货</button> </view>
+            <view class="list-button-item"><button disabled="true" class="admin-button-com bule active list-btn--compact">发货</button> </view>
           </block>
           <view class="list-button-item">
-            <button @click.stop="printWlFlag(item)" class="admin-button-com bule">
+            <button @click.stop="printWlFlag(item)" class="admin-button-com bule list-btn--wide">
               物流标<text>({{ item.printWlNum || 0 }})</text>
             </button>
           </view>
           <view class="list-button-item" v-if="currentStatus == 1">
             <button
               disabled="true"
-              class="admin-button-com bule active"
+              class="admin-button-com bule active list-btn--wide"
               :class="{ 'print-btn--unprinted': !isPrinted(item) }"
             >打印({{ item.printNum || 0 }})</button>
           </view>
           <view class="list-button-item" v-else>
             <button
               @click.stop="printOrder(item)"
-              class="admin-button-com bule"
+              class="admin-button-com bule list-btn--wide"
               :class="{ 'print-btn--unprinted': !isPrinted(item) }"
             >
               打印<text>({{ item.printNum || 0 }})</text>
             </button>
           </view>
-          <view class="list-button-item action-icon-btn" @click.stop="openMore(item)">
-            <image class="action-icon-btn__icon" :src="iconSrc('more_button')" mode="aspectFit" />
+          <view class="list-button-item">
+            <button @click.stop="openMore(item)" class="admin-button-com bule list-btn--compact">更多</button>
           </view>
         </view>
       </view>
@@ -319,7 +324,6 @@ import { createExpressOrder, cancelExpressOrder as cancelSFExpressOrder } from '
 import { cancelDeliveryOrder } from '@/api/express/delivery';
 import { createCallExpressOrder, cancelCallExpressOrder,getOrderFee } from '@/api/shop/shop-express';
 import { printWlLabel, cloudPrintOrder, getOrderPrintLog, modifyRemarkFn } from '@/api/order';
-import { iconSrc } from '@/utils/iconSrc';
 export default {
   name: 'OrderItem',
   options: {
@@ -366,7 +370,6 @@ export default {
     }
   },
   methods: {
-    iconSrc,
     modifyAddress(item) {
       this.closeExpressPop()
       this.$util.pageTo({url: '/pagesClient/member/modify?id=' + item.customId + '&name=' + item.customName,type:2})
@@ -612,17 +615,6 @@ export default {
 .class-popup-style {
   z-index: 999999;
 }
-.admin-button-com {
-  width: 140upx;
-  height: 60upx;
-  padding: 0;
-  line-height: 60upx;
-  text-align: center;
-  font-size: 26upx;
-  &.active {
-    border: 1upx solid #ccc;
-  }
-}
 .print-btn--unprinted {
   color: #fff;
   background-color: $mainColor;
@@ -647,7 +639,7 @@ export default {
     width: 100%;
     display: flex;
     flex-wrap: wrap;
-    justify-content: space-around;
+    justify-content: space-between;
     align-items: center;
     .list-button-item {
       display: flex;
@@ -657,31 +649,34 @@ export default {
       flex: none;
       min-height: 48upx;
     }
+    /* 底部操作栏按钮基础样式 */
     .admin-button-com {
+      height: 60upx;
+      padding: 0 12upx;
+      line-height: 60upx;
+      text-align: center;
+      font-size: 26upx;
       margin: 0;
-      min-width: 90upx;
+      min-width: 100upx;
       max-width: 140upx;
+      width: auto;
       flex: none;
       box-sizing: border-box;
-    }
-    .action-icon-btn {
-      width: 52upx;
-      height: 52upx;
-      padding: 0;
-      line-height: 1;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex: none;
-      background: transparent;
-      border: none;
-      &::after {
-        border: none;
+      &.active {
+        border: 1upx solid #ccc;
+      }
+      /* 两字按钮：分享、更多、发货 */
+      &.list-btn--compact {
+        width: 105upx;
+        padding: 0;
+      }
+      /* 带计数文案：物流标、打印 */
+      &.list-btn--wide {
+        min-width: 140upx;
+        max-width: 200upx;
+        width: auto;
+        padding: 0 16upx;
       }
-    }
-    .action-icon-btn__icon {
-      width: 52upx;
-      height: 52upx;
     }
   }
 }
@@ -794,6 +789,10 @@ export default {
   display: block !important; /* 覆盖父级的 flex 布局 */
 }
 
+.remark-box--editable:active {
+  opacity: 0.85;
+}
+
 .remark-box .remark-text {
   color: #d32f2f !important; /* 强制覆盖父级颜色 */
   font-weight: bold !important;

mallApp/src/api/mini/index.js

@@ -21,6 +21,13 @@ export const getWxPhone = data => {
 	return https.post('/user/mini-mobile', data)
 }
 
+/** *
+ * 点击授权获取手机号 mini (新接口)
+ */
+export const getMiniMobile = data => {
+	return https.post('/user/get-mini-mobile', data)
+}
+
 //点击授权获取字典
 export const getDictionaries = data => {
 	return https.post('/console/init', data)

mallApp/src/components/wangCg.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { getWxPhone } from "@/api/mini"
+import { getMiniMobile } from "@/api/mini"
 import { create } from "@/api/user"
 import store from '@/store'
 import { TOKEN_STORAGE_KEY } from "@/constant/storageKeys";
@@ -62,25 +62,13 @@ export default {
   methods: {
     getWxMobile(e) {
       let that = this
-      if (e.detail.errMsg === "getPhoneNumber:ok") {
-        let currentMiniOpenId = uni.getStorageSync('miniOpenId')
-        getWxPhone({ iv: e.detail.iv, encryptedData: e.detail.encryptedData, miniOpenId: currentMiniOpenId }).then(subRes => {
-            if(subRes.data && subRes.data.hasNoOpenId && subRes.data.hasNoOpenId == 1){
-              uni.showModal({
-                title: '提示',
-                content: '网络异常，请重试一次',
-                success: function (res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定')
-                  }
-                }
-              })
-              return false
-            }
-            this.form.mobile = subRes.data.mobile
-            that.confirmFn()
-        })
-      } else {
+    if (e.detail.errMsg === "getPhoneNumber:ok") {
+      let code = e.detail.code
+      getMiniMobile({ code: code }).then(subRes => {
+        this.form.mobile = subRes.data.mobile
+        that.confirmFn()
+      })
+    } else {
         this.$msg("获取手机失败");
       }
     },

mallApp/src/pages/login/index.vue

@@ -37,7 +37,7 @@
 <script>
 import TuiListCell from "@/components/plugin/list-cell"
 const form = require("@/utils/formValidation.js")
-import { getWxInfo, getWxPhone } from "@/api/mini"
+import { getWxInfo, getMiniMobile } from "@/api/mini"
 import { create } from "@/api/user"
 import store from '@/store'
 import { TOKEN_STORAGE_KEY } from "@/constant/storageKeys";
@@ -93,25 +93,13 @@ export default {
     },
     getWxMobile(e) {
       let that = this
-      if (e.detail.errMsg === "getPhoneNumber:ok") {
-        let currentMiniOpenId = uni.getStorageSync('miniOpenId')
-        getWxPhone({ iv: e.detail.iv, encryptedData: e.detail.encryptedData, miniOpenId: currentMiniOpenId }).then(subRes => {
-          if (subRes.data && subRes.data.hasNoOpenId && subRes.data.hasNoOpenId == 1) {
-            uni.showModal({
-              title: '提示',
-              content: '网络异常，请重试一次',
-              success: function (res) {
-                if (res.confirm) {
-                  console.log('用户点击确定')
-                }
-              }
-            })
-            return false
-          }
-          this.form.mobile = subRes.data.mobile
-          that.confirmFn()
-        })
-      } else {
+    if (e.detail.errMsg === "getPhoneNumber:ok") {
+      let code = e.detail.code
+      getMiniMobile({ code: code }).then(subRes => {
+        this.form.mobile = subRes.data.mobile
+        that.confirmFn()
+      })
+    } else {
         this.$msg("获取手机失败");
       }
     }