Merge remote-tracking branch 'origin/main'

yudao-mall-uniapp-master/.env.development

@@ -1,2 +1,5 @@
  # SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz
- SHOPRO_DEV_BASE_URL = http://192.168.1.118:48080
+#  SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080
+
+ # 线上地址
+ SHOPRO_DEV_BASE_URL = https://zda.huamar.com

yudao-mall-uniapp-master/.env.production

@@ -1,2 +1,2 @@
-SHOPRO_DEV_BASE_URL = https://123456789.shopro.cn
+SHOPRO_DEV_BASE_URL = https://zda.huamar.com
  

yudao-mall-uniapp-master/README.md

@@ -15,7 +15,7 @@
 
 ## 🐯 商城简介
 
-**芋道商城**，基于 [芋道开发平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建，以开发者为中心，打造中国第一流的 Java 开源商城系统，全部开源，个人与企业可 100% 免费使用。
+**郑大钒水**，基于 [郑大钒水平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建，以开发者为中心，打造中国第一流的 Java 开源商城系统，全部开源，个人与企业可 100% 免费使用。
 
 > 有任何问题，或者想要的功能，可以在 Issues 中提给艿艿。
 >

yudao-mall-uniapp-master/manifest.json

@@ -184,7 +184,7 @@
     "versionCode": 100
   },
   "mp-weixin": {
-    "appid": "wx53b5ac263b9cdb5b",
+    "appid": "wx879300e525dc9847",
     "setting": {
       "urlCheck": false,
       "minified": true,

yudao-mall-uniapp-master/package.json

@@ -1,9 +1,9 @@
 {
   "id": "shopro",
   "name": "shopro",
-  "displayName": "芋道商城",
+  "displayName": "郑大钒水",
   "version": "2.1.0",
-  "description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
+  "description": "郑大钒水，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
   "scripts": {
     "prettier": "prettier --write  \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
   },

yudao-mall-uniapp-master/pages/order/confirm.vue

@@ -186,8 +186,8 @@
       items: [], // 商品项列表
       price: {}, // 价格信息
     },
-	deliType:2,
-	pickUpInfo:{},//门店信息
+	  deliType:2,
+	  pickUpInfo:{},//门店信息
     addressInfo: {}, // 选择的收货地址
     showCoupon: false, // 是否展示优惠劵
     couponInfo: [], // 优惠劵列表
@@ -230,9 +230,18 @@
 
   // 提交订单
   function onConfirm() {
-    if (!state.addressInfo.id) {
-      sheep.$helper.toast('请选择收货地址');
-      return;
+    console.log(state.deliType, '11111111111111111');
+
+    if (state.deliType == 1) {
+      if (!state.addressInfo.id) {
+        sheep.$helper.toast('请选择收货地址');
+        return;
+     }
+    }else{
+      if (!state.pickUpInfo.id) {
+        sheep.$helper.toast('请选择自提门店');
+        return;
+      }
     }
     submitOrder();
   }
@@ -250,7 +259,7 @@
       items: state.orderPayload.items,
       couponId: state.orderPayload.couponId,
       addressId: state.deliType === 1 ? state.addressInfo.id: null,
-	  pickUpStoreId:state.deliType === 2 ? state.pickUpInfo.id : null,
+	    pickUpStoreId:state.deliType === 2 ? state.pickUpInfo.id : null,
       deliveryType: state.deliType, // TODO 芋艿：需要支持【门店自提】
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,

yudao-mall-uniapp-master/pages/pay/index.vue

@@ -17,7 +17,7 @@
         <view class="pay-title ss-p-l-30 ss-m-y-30">选择支付方式</view>
         <radio-group @change="onTapPay">
           <label class="pay-type-item" v-for="item in state.payMethods" :key="item.title">
-            <view
+            <view v-if="!item.disabled"
               class="pay-item ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom"
               :class="{ 'disabled-pay-item': item.disabled }"
             >

yudao-mall-uniapp-master/sheep/components/s-auth-modal/components/sms-login.vue

@@ -2,7 +2,7 @@
 <template>
   <view>
     <!-- 标题栏 -->
-    <view class="head-box ss-m-b-60">
+    <!-- <view class="head-box ss-m-b-60">
       <view class="ss-flex ss-m-b-20">
         <view class="head-title head-title-line head-title-animation">短信登录</view>
         <view class="head-title-active ss-m-r-40" @tap="showAuthModal('accountLogin')">
@@ -10,10 +10,10 @@
         </view>
       </view>
       <view class="head-subtitle">未注册的手机号，验证后自动注册账号</view>
-    </view>
+    </view> -->
 
     <!-- 表单项 -->
-    <uni-forms
+    <!-- <uni-forms
       ref="smsLoginRef"
       v-model="state.model"
       :rules="state.rules"
@@ -54,7 +54,7 @@
           </template>
         </uni-easyinput>
       </uni-forms-item>
-    </uni-forms>
+    </uni-forms> -->
   </view>
 </template>
 

yudao-mall-uniapp-master/sheep/components/s-auth-modal/index.scss

@@ -104,7 +104,7 @@
   width: 100%;
   .auto-login-btn {
     width: 68rpx;
-    height: 68rpx;
+    height: 168rpx;
     border-radius: 50%;
     margin: 0 30rpx;
   }

yudao-mall-uniapp-master/sheep/components/s-auth-modal/s-auth-modal.vue

@@ -31,7 +31,7 @@
       >
         <!-- 7.1 微信小程序的快捷登录 -->
         <view v-if="sheep.$platform.name === 'WechatMiniProgram'" class="ss-flex register-box">
-          <view class="register-title">还没有账号?</view>
+          <!-- <view class="register-title">还没有账号?</view> -->
           <button class="ss-reset-button login-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
             快捷登录
           </button>

yudao-mall-uniapp-master/sheep/components/s-share-modal/s-share-modal.vue

@@ -36,14 +36,14 @@
           </button>
 
           <!-- 操作 ③：生成链接 -->
-          <button
+          <!-- <button
             v-if="shareConfig.methods.includes('link')"
             class="share-item share-btn ss-flex-col ss-col-center"
             @tap="onShareByCopyLink"
           >
             <image class="share-img" :src="sheep.$url.static('/static/img/shop/share/share_link.png')" mode="" />
             <text class="share-title">复制链接</text>
-          </button>
+          </button> -->
         </view>
         <view class="share-foot ss-flex ss-row-center ss-col-center" @tap="closeShareModal">
           取消

yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js

@@ -164,10 +164,11 @@ const checkUpdate = async (silence = true) => {
 
 // 获取订阅消息模板
 async function getSubscribeTemplate() {
-  const { error, data } = await third.wechat.subscribeTemplate();
-  if (error === 0) {
-    subscribeEventList = data;
-  }
+  // const { error, data } = await third.wechat.subscribeTemplate();
+  // if (error === 0) {
+  //   subscribeEventList = data;
+  // }
+  console.log('获取订阅消息模板');
 }
 
 // 订阅消息