src/config/index.ts

@@ -11,19 +11,19 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.11:8081', // 王
   // develop: 'http://192.168.1.21:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
-  develop: 'http://47.109.84.152:8081', // 测试代理
+  // develop: 'http://47.109.84.152:8081', // 测试代理
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://25740642.r3.cpolar.top',
-  // develop: 'https://smqjh.api.zswlgz.com',
+  develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */
   // trial: "http://192.168.1.166:8080/jeecg-boot",
   // trial: 'http://192.168.0.157:8080',
-  trial: 'http://47.109.84.152:8081',
+  // trial: 'http://47.109.84.152:8081',
   // trial: 'http://192.168.0.11:8081', // 王
   // trial: 'http://192.168.1.166:8080,
-  // trial: 'https://smqjh.api.zswlgz.com',
+  trial: 'https://smqjh.api.zswlgz.com',
   /**
    * 正式版
    */
@@ -51,8 +51,8 @@ function handleEnvVersion() {
     // development: 'http://192.168.0.11:8081',
     // development: 'http://192.168.1.21:8080',
     // development: 'https://smqjh.api.zswlgz.com',
-    // production: 'https://smqjh.api.zswlgz.com',
-    production: 'http://47.109.84.152:8081',
+    production: 'https://smqjh.api.zswlgz.com',
+    // production: 'http://47.109.84.152:8081',
   }
   console.log(mode, '==================mode===================')
   return h5Server[mode as 'development' | 'production']

src/store/user.ts

@@ -599,8 +599,8 @@ export const useUserStore = defineStore('user', {
         .join('&')
       const path = 'subPack-common/threePay/index'
       // const env = 'develop'
-      const env = 'trial'
-      // const env = 'release'
+      // const env = 'trial'
+      const env = 'release'
       window.location.href = `weixin://dl/business/?appid=wx43b5b906cc30ed0b&path=${path}&query=${encodeURIComponent(queryString)}&env_version=${env}`
       uni.hideLoading()
       // #endif

src/subPack-common/integral/index.vue

@@ -89,7 +89,7 @@ getNavList()
       </view>
       <StatusTip v-if="!pointList.length" tip="暂无内容" />
     </scroll-view>
-    <Zpopup v-model="showPointsPopup" :showfooter="false" bg="#fff">
+    <!-- <Zpopup v-model="showPointsPopup" :showfooter="false" bg="#fff">
       <view class="px-32rpx pb-40rpx pt-40rpx">
         <view class="mb-32rpx text-center text-32rpx font-bold">
           积分有限期
@@ -128,7 +128,7 @@ getNavList()
           <view>3.如若交易在使用的积分有效期之外发生退款，该部分积分也为过期。</view>
         </view>
       </view>
-    </Zpopup>
+    </Zpopup> -->
   </view>
 </template>
 

src/subPack-xsb/confirmOrder/index.vue

@@ -70,7 +70,8 @@ const memberDiscountCents = computed(() => {
 })
 const offsetPoints = computed(() => {
   const couponCents = Math.round(currentCouponDiscount.value * 100)
-  const money = Math.round(Number(unref(orderInfo)?.transfee) * 100) + Math.round(Number(unref(orderInfo)?.price) * 100) - couponCents - memberDiscountCents.value
+  const freightCents = isSelfPickup.value ? 0 : Math.round(Number(unref(orderInfo)?.transfee) * 100)
+  const money = freightCents + Math.round(Number(unref(orderInfo)?.price) * 100) - couponCents - memberDiscountCents.value
   const cap = Math.max(0, money)
   if (Number(unref(orderInfo)?.offsetPoints) > cap) {
     return cap