新增搜索选择快递公司功能

pageC/myPackage/component/packageCard.vue

@@ -2,10 +2,12 @@
   <view class="card" @click="$emit('toInformation', itemInfo)">
     <view class="top-detail">
       <view class="top-left">
-        <view class="_label-1" v-if="itemInfo.mall_order_id >= 0">
+        <view class="_label-1" v-if="itemInfo.mall_order_id > 0">
           平台自购
         </view>
-        <view class="_label-2" v-if="itemInfo.labelStatus == 0"> 自寄 </view>
+        <view class="_label-2" v-else-if="itemInfo.mall_order_id == 0">
+          自寄
+        </view>
         <view class="order-num">
           <text>订单编号：</text>
           <text>{{ itemInfo.order_no }}</text>
@@ -17,12 +19,12 @@
     </view>
     <view class="content-center">
       <view class="center-left-right">
-        <view class="address"> {{ itemInfo.from_province_name }} </view>
+        <view class="address"> {{ itemInfo.from_province_name || "" }} </view>
         <view class="name"> {{ itemInfo.from_name }} </view>
       </view>
       <image class="arrow" src="../../../static/mine/337.png" mode=""></image>
       <view class="center-left-right">
-        <view class="address"> {{ itemInfo.to_province_name }} </view>
+        <view class="address"> {{ itemInfo.to_province_name || "" }} </view>
         <view class="name"> {{ itemInfo.to_name }} </view>
       </view>
     </view>
@@ -78,6 +80,13 @@
         >
           去寄件
         </button>
+        <button
+          class="btn-2"
+          @click.stop="toSending"
+          v-show="itemInfo.status == 'domestic_delivered'"
+        >
+          填写快递信息
+        </button>
       </view>
     </view>
   </view>

pageC/myPackage/myPackage.vue

@@ -89,6 +89,9 @@ export default {
       this.getPackageList(1);
     },
     toInformation(value) {
+      if (value.status == "imperfect") {
+        return;
+      }
       uni.navigateTo({
         url: `/pageD/orderInformation/orderInformation?orderStatus=${value.id}`,
       });

pageC/orderForm/component/orderInofrmation.vue

@@ -27,7 +27,7 @@
     >
       <view class="commodity-1">
         <image class="commodity-img" :src="item.goods_image" mode=""></image>
-        <view class="">
+        <view style="width: 70%">
           <view class="commodity-2">
             <view class="commodity-title"> {{ item.goods.name_cn }} </view>
             <view class="commodity-price">
@@ -44,6 +44,14 @@
             <view class="specifications"> {{ item.sku_item.item }} </view>
             <view style="font-size: 24rpx"> x{{ item.goods_num }} </view>
           </view>
+
+          <button
+            v-if="itemInfo.order.status == 'unreview'"
+            @click.stop="$emit('unreviewAfter', item)"
+            class="application"
+          >
+            申请退款
+          </button>
         </view>
       </view>
     </view>
@@ -67,9 +75,6 @@
       >
         取消订单
       </button>
-      <button v-if="itemInfo.order.status == 'unreview'" class="status-1">
-        申请退款
-      </button>
       <button
         class="status-2"
         v-if="itemInfo.order.status == 'unpaid'"
@@ -247,6 +252,23 @@ export default {
           color: #777;
         }
       }
+      .application {
+        background-color: #fff;
+        border-radius: 34rpx;
+        padding: 0;
+        margin: 0;
+        // padding: 0 26rpx;
+        font-size: 28rpx;
+        color: #222;
+        height: 58rpx;
+        line-height: 58rpx;
+        margin-left: 20rpx;
+        border: 2rpx solid #979797;
+        margin-top: 10rpx;
+        width: 140rpx;
+        font-size: 22rpx;
+        float: right;
+      }
     }
   }
   .price {

pageC/orderForm/orderForm.vue

@@ -68,6 +68,7 @@
             @confirm="confirm"
             @toPay="toPay"
             @toEvaluate="toEvaluate"
+            @unreviewAfter="unreviewAfter"
           />
         </view>
         <view v-else>
@@ -139,6 +140,14 @@ export default {
         url: `/pageD/evaluate/evaluate?orderId=${value.order.id}`,
       });
     },
+
+    //拼团中售后
+    unreviewAfter(value) {
+      console.log(value);
+      uni.navigateTo({
+        url: `/pageC/applicationRefund/applicationRefund?orderId=${value.goods_id}`,
+      });
+    },
     //确认收货
     confirm(value) {
       this.agreeShow = true;

pageD/components/selectExpress.vue

@@ -0,0 +1,49 @@
+<template>
+  <view v-if="show" class="select-list">
+    <view
+      @click="$emit('selected', item)"
+      class="_label"
+      v-for="(item, index) in filterList"
+      :key="index"
+      >{{ item.name }}
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "selectExpress",
+  props: {
+    show: {
+      typeof: Boolean,
+      default: false,
+    },
+    filterList: {
+      typeof: Array,
+      default: () => {
+        return {};
+      },
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.select-list {
+  background-color: #fff;
+  border-radius: 10rpx;
+  padding: 14rpx;
+  position: absolute;
+  bottom: 200rpx;
+  right: 70rpx;
+  z-index: 1000;
+  width: 300rpx;
+  height: 220rpx;
+  overflow-y: auto;
+  box-shadow: 0 0 4rpx #b6b5b5;
+  ._label {
+    font-size: 28rpx;
+    color: #000;
+    margin: 20rpx;
+    text-align: center;
+  }
+}
+</style>

pageD/orderInformation/component/fill.vue

@@ -0,0 +1,119 @@
+<template>
+  <view>
+    <u-popup :show="show" @close="$emit('close')" :round="10" closeable>
+      <view class="title"> 填写快递信息 </view>
+      <view class="content">
+        <view class="_label" @click="openSelect">
+          <view class="name">快递公司</view>
+          <u--input
+            placeholder="请选择快递公司"
+            border="none"
+            v-model="expressName"
+            inputAlign="right"
+            @change="searchExpress"
+          ></u--input>
+        </view>
+        <view class="_label">
+          <view class="name">快递单号</view>
+          <u--input
+            placeholder="请输入内容"
+            border="none"
+            v-model="expressNum"
+            inputAlign="right"
+          ></u--input>
+        </view>
+
+        <SelectExpress
+          :show="nameShow"
+          :filterList="filterList"
+          @selected="selected"
+        />
+      </view>
+      <button class="btn" @click="$emit('close')">立即保存</button>
+    </u-popup>
+  </view>
+</template>
+<script>
+import SelectExpress from "../../components/selectExpress.vue";
+export default {
+  components: { SelectExpress },
+  props: {
+    show: {
+      typeof: Boolean,
+      default: false,
+    },
+  },
+  name: "fill",
+  data() {
+    return {
+      expressName: "",
+      expressNum: "",
+      expressNameList: [], //快递公司
+      nameShow: false,
+      filterList: [],
+    };
+  },
+  methods: {
+    //过滤搜索结果
+    searchExpress(e) {
+      this.nameShow = true;
+      this.filterList = this.expressNameList
+        .filter((item) => item.name.includes(e))
+        .map((item) => item);
+    },
+
+    //获取选中的快递公司
+    selected(value) {
+      this.expressName = value.name;
+      this.nameShow = false;
+    },
+    //打开下拉
+    openSelect() {
+      this.nameShow = true;
+    },
+    getExpressNameList() {
+      uni.$u.http.get(`/api/express-company`).then((res) => {
+        this.expressNameList = res;
+        this.filterList = res;
+      });
+    },
+  },
+  mounted() {
+    this.getExpressNameList();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.title {
+  height: 100rpx;
+  text-align: center;
+  line-height: 100rpx;
+  font-size: 36rpx;
+  color: rgba(34, 34, 34, 1);
+  font-weight: 600;
+}
+.content {
+  padding: 0 32rpx;
+  margin-bottom: 126rpx;
+  position: relative;
+  ._label {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    height: 100rpx;
+    margin-top: 16rpx 24rpx;
+    border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
+    .name {
+      color: rgba(85, 85, 85, 1);
+      font-size: 30rpx;
+    }
+  }
+}
+.btn {
+  background-color: #f83224;
+  color: #fff;
+  border-radius: 44rpx;
+  margin: 0 auto 50rpx;
+  width: 90%;
+}
+</style>

pageD/orderInformation/orderInformation.vue

@@ -172,6 +172,13 @@
       <button class="btn-1" @click="toLogistics">删除</button>
       <button class="btn-1" @click="toLogistics">查看物流</button>
       <button
+        class="btn-1"
+        @click="fillInformation"
+        v-if="orderInformation.status == 'domestic_undelivered'"
+      >
+        填写物流信息
+      </button>
+      <button
         class="btn-2"
         @click="toPay"
         v-if="orderInformation.status == 'unpaid'"
@@ -179,11 +186,38 @@
         立即付款
       </button>
     </view>
+    <view
+      class="footer"
+      v-else-if="
+        orderInformation.status == 'domestic_undelivered' ||
+        orderInformation.status == 'unpaid'
+      "
+    >
+      <button
+        class="btn-1"
+        @click="fillInformation"
+        v-if="orderInformation.status == 'domestic_undelivered'"
+      >
+        填写物流信息
+      </button>
+      <button
+        class="btn-2"
+        @click="toPay"
+        v-if="orderInformation.status == 'unpaid'"
+      >
+        立即付款
+      </button></view
+    >
+    <Fill :show="show" @close="close" />
   </view>
 </template>
 
 <script>
+import Fill from "./component/fill.vue";
 export default {
+  components: {
+    Fill,
+  },
   data() {
     return {
       orderStauts: 0,
@@ -191,6 +225,7 @@ export default {
       orderDetail: "",
       packageId: "",
       orderInformation: {},
+      show: false,
     };
   },
   computed: {},
@@ -214,11 +249,23 @@ export default {
     setStatus(num) {
       this.orderStauts = num;
     },
+    //查看物流进度
     toLogistics() {
       uni.navigateTo({
         url: "/pageD/logisticsProgress/logisticsProgress",
       });
     },
+
+    //填写物流信息
+    fillInformation() {
+      this.show = true;
+    },
+
+    //关闭弹窗
+    close() {
+      this.show = false;
+    },
+    //去支付
     toPay() {
       uni.navigateTo({
         url: "/pageD/paymentOrder/paymentOrder",
@@ -243,10 +290,7 @@ export default {
           });
           this.orderDetail = "商品已打包称重，等待用户付款";
           this.orderTitle = "待付款";
-        } else if (
-          this.orderInformation.status == "overseas_undelivered" ||
-          this.orderInformation.status == "domestic_undelivered"
-        ) {
+        } else if (this.orderInformation.status == "overseas_undelivered") {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
             frontColor: "#000000",
@@ -314,6 +358,14 @@ export default {
           });
           this.orderDetail = "订单正在申请退款";
           this.orderTitle = "退款中";
+        } else if (this.orderInformation.status == "domestic_undelivered") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "商品等待发货中";
+          this.orderTitle = "国内待发货";
         }
       });
     },

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -4875,7 +4875,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {
@@ -12071,7 +12071,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -19139,7 +19139,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -19160,14 +19160,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -19263,7 +19263,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"kjds","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));