绿满眶商城微信小程序-uniapp
58600a13ffe0d5225573f404a7f66118bc05f850..577042a77ff72607e2cd5de3a06f33a1c9d3f703
2025-09-16 peng
Merge branch 'dev_fix_sub' into user_action
577042 对比 | 目录
2025-09-16 peng
页面调整
b84526 对比 | 目录
2025-09-12 peng
解决退货无法提交退货单问题
9ccb10 对比 | 目录
6个文件已修改
59 ■■■■ 已修改文件
pages.json 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/commodity-square/commoditySquare.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mine/address/add.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/myOrder.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/passport/wechatMPLogin.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/tabbar/index/home.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -1719,7 +1719,20 @@
          }
        },
        {
          "path": "afterSales/afterSalesDetailExpress"
          "path": "afterSales/afterSalesDetailExpress",
          "style": {
              "componentPlaceholder":{
                "u-image": "view",
                "u-icon": "view",
                "u-form": "view",
                "u-form-item": "view",
                "u-input": "view",
                "u-button": "view",
                "u-select": "view",
                "u-calendar": "view",
                "u-toast": "view"
            }
          }
        },
        {
          "path": "afterSales/afterSalesSelect",
@@ -1727,7 +1740,15 @@
            "navigationBarTitleText": "申请售后",
            "componentPlaceholder": {
              "u-image": "view",
              "u-icon": "view"
              "u-icon": "view",
              "u-form": "view",
              "u-form-item": "view",
              "u-input": "view",
              "u-button": "view",
              "u-select": "view",
              "u-calendar": "view",
              "u-toast": "view"
            }
          }
        },
pages/commodity-square/commoditySquare.vue
@@ -51,10 +51,10 @@
                            <view class="goodsContent" style="font-size: 24rpx;">
                                {{item.sellingPoint}}
                            </view>
                            <view v-if="item.goodsType !=='VIRTUAL_GOODS'"
                                style="display: flex; justify-content: space-between;align-items:center; 100%;width: 100%;">
                                <view class="goodsPrice">¥{{item.price}}</view>
                                <view class="addCard" style="display: flex; align-items: center;">
                            <view
                                style="display: flex; justify-content: space-between;align-items:center;height: 100%;width: 100%;">
                                <view class="goodsPrice" style="padding: 20rpx 0;">¥{{item.price}}</view>
                                <view class="addCard" style="display: flex; align-items: center;" v-if="item.goodsType !=='VIRTUAL_GOODS'">
                                    <view style="padding: 20rpx 0 20rpx 20rpx;" v-show="item.cardNum && item.cardNum>0"
                                        @click.stop="miousCardNum($event,item.id)">
                                        <uni-icons type="minus" size="30" color="#96a6bc"></uni-icons>
pages/mine/address/add.vue
@@ -12,7 +12,7 @@
        </u-form-item>
        <u-form-item label="手机号码" label-width="130" prop="mobile">
          <u-input v-model="form.mobile" type="number" maxlength="11" placeholder="请输入收货人手机号码" />
          <u-input v-model="form.mobile" type="number"   maxlength="15" placeholder="请输入收货人手机号码" />
        </u-form-item>
        <u-form-item label="所在区域" label-width="130" prop="___path">
          <div  @click="showPicker" >
@@ -55,6 +55,11 @@
    // 判断当前系统权限定位是否开启
  },
  methods: {
    changePhone(e) {
      console.log('-------------------->手机号码修改', e);
      // 去除空格
      this.form.mobile = this.form.mobile.replace(/\s/g, '');
    },
    // 关闭地图
    closeMap() {
      this.mapFlag = false;
@@ -145,6 +150,7 @@
    // 保存当前 地址
    save() {
      this.$refs.uForm.setRules(this.rules);
      this.$refs.uForm.validate((valid) => {
        if (valid) {
          let pages = getCurrentPages(); //获取页面栈
@@ -287,8 +293,16 @@
  },
  // 初始化rules必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕
  onReady() {
    this.$refs.uForm.setRules(this.rules);
    // this.$refs.uForm.setRules(this.rules);
  },
  watch:{
    'form.mobile': function(newVal, oldVal) {
      // 当手机号变化时,自动去除空格
      if (newVal && typeof newVal === 'string') {
        this.form.mobile = newVal.replace(/\s/g, '');
      }
    }
  }
};
</script>
<style scoped lang="scss">
pages/order/myOrder.vue
@@ -107,7 +107,7 @@
                    shape="circle"
                    class="cancel-btn"
                    size="mini"
                    v-if="order.couponFlag === 'COUPON'"
                    v-if="order.couponFlag === 'COUPON'&& order.orderStatus ==='COMPLETED'"
                    @click="openCouponPackage(order)"
                  >
                    优惠券卡包
pages/passport/wechatMPLogin.vue
@@ -134,8 +134,8 @@
                whetherNavigate("wx");
            },
            backToHome() {
                uni.switchTab({
                    url: `/pages/tabbar/home/index`,
                uni.redirectTo({
                    url: `/pages/tabbar/index/home`,
                });
            },
            
pages/tabbar/index/home.vue
@@ -61,7 +61,7 @@
                <!-- 悬挂商品链接层 -->
                <view class="goods-link-warp" v-if="item.goodsList.length > 0">
                <view class="goods-link-warp" :style="{ bottom: marginBottom + 55 + 'px' }" v-if="item.goodsList.length > 0">
                    <view class="goods-link">
                        <swiper @change="goodsChange" :autoplay="true" :interval="4000" style="height: 120rpx;">
                            <swiper-item v-for="goods in item.goodsList" :key="goods.goodsId">