冲突

components/kj-tabbar/kj-tabbar.vue

@@ -75,6 +75,20 @@ export default {
       type: String,
       default: "",
     },
+    //购物车所有商品
+    goodsList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    //购物车选中的商品
+    checkboxValue1: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
   },
   computed: {
     i18n() {
@@ -127,6 +141,8 @@ export default {
   },
   methods: {
     account() {
+      console.log(this.checkboxValue1);
+      console.log(this.goodsList);
       uni.navigateTo({
         url: "/pageA/order",
       });
@@ -181,7 +197,6 @@ export default {
     },
 
     click1(e) {
-      console.log(e);
       if (e == 4) {
         uni.switchTab({
           url: "../../pages/mine/mine",

pageC/orderForm/component/orderInofrmation.vue

@@ -63,13 +63,13 @@
       <button
         class="status-1"
         @click.stop="$emit('cancellationOrder', itemInfo)"
-        v-if="
-          itemInfo.order.status == 'unpaid' ||
-          itemInfo.order.status == 'unreview'
-        "
+        v-if="itemInfo.order.status == 'unpaid'"
       >
         取消订单
       </button>
+      <button v-if="itemInfo.order.status == 'unreview'" class="status-1">
+        申请退款
+      </button>
       <button
         class="status-2"
         v-if="itemInfo.order.status == 'unpaid'"
@@ -117,7 +117,7 @@
       <button
         class="status-2"
         v-if="itemInfo.order.status == 'finished'"
-        @click.stop="toEvaluate"
+        @click.stop="$emit('toEvaluate', itemInfo)"
       >
         评价
       </button>
@@ -168,11 +168,11 @@ export default {
     itemInfo(newVal) {},
   },
   methods: {
-    toEvaluate() {
-      uni.navigateTo({
-        url: "/pageD/evaluate/evaluate",
-      });
-    },
+    // toEvaluate() {
+    //   uni.navigateTo({
+    //     url: "/pageD/evaluate/evaluate?",
+    //   });
+    // },
   },
 };
 </script>

pageC/orderForm/orderForm.vue

@@ -67,6 +67,7 @@
             @cancellationOrder="cancellationOrder"
             @confirm="confirm"
             @toPay="toPay"
+            @toEvaluate="toEvaluate"
           />
         </view>
         <view v-else>
@@ -132,6 +133,12 @@ export default {
       });
     },
 
+    //跳转评价
+    toEvaluate(value) {
+      uni.navigateTo({
+        url: `/pageD/evaluate/evaluate?orderId=${value.order.id}`,
+      });
+    },
     //确认收货
     confirm(value) {
       this.agreeShow = true;

pageD/afterSalesManage/afterSalesManage.vue

@@ -38,10 +38,11 @@
           @agreeRefund="agreeRefund"
           @refuseRefund="refuseRefund"
           @platformIntervene="platformIntervene"
+          @openPop="openPop"
         />
       </view>
     </view>
-    <AgreePop :show="show" @close="close" @refund="refund" />
+    <AgreePop :title="title" :show="show" @close="close" @refund="refund" />
     <RefusePopup :show="refuseShow" @close="close" @refund="refund" />
   </view>
 </template>
@@ -65,6 +66,7 @@ export default {
       refuseShow: false,
       page: 1,
       total: 0,
+      title: "",
     };
   },
   methods: {
@@ -107,23 +109,46 @@ export default {
       this.show = false;
       this.refuseShow = false;
     },
-    //确认退款 or 拒绝退款
+    //打开删除确认框
+    openPop(value) {
+      this.title = "是否确认删除售后记录";
+      this.show = true;
+      this.needDeleteGoods = value;
+    },
+    //确认退款 or 拒绝退款 or 删除记录
     refund(status, value) {
-      uni.$u.http
-        .post(`/api/order_refund/examine`, {
-          status,
-          order_refund_id: this.needRdfundOrder.id,
-          reason: value,
-        })
-        .then((res) => {
-          this.show = false;
-          this.refuseShow = false;
-          uni.showToast({
-            title: status == 1 ? "已同意退款" : "已拒绝退款",
-            icon: "none",
+      if (this.title == "是否确认退款") {
+        //处理退款
+        uni.$u.http
+          .post(`/api/order_refund/examine`, {
+            status,
+            order_refund_id: this.needRdfundOrder.id,
+            reason: value,
+          })
+          .then((res) => {
+            this.show = false;
+            this.refuseShow = false;
+            uni.showToast({
+              title: status == 1 ? "已同意退款" : "已拒绝退款",
+              icon: "none",
+            });
+            this.getOrderList();
           });
-          this.getOrderList();
-        });
+      } else {
+        //订单删除
+        uni.$u.http
+          .post(`api/order/refund_order_del`, {
+            order_refund_id: this.needDeleteGoods.id,
+          })
+          .then((res) => {
+            uni.showToast({
+              title: "商品已删除",
+              icon: "none",
+            });
+            this.show = false;
+            this.getOrderList();
+          });
+      }
     },
     refuseRefund(item) {
       this.refuseShow = true;
@@ -131,6 +156,7 @@ export default {
     },
     //打开同意退款确认框
     agreeRefund(item) {
+      this.title = "是否确认退款";
       this.show = true;
       this.needRdfundOrder = item;
     },

pageD/afterSalesManage/component/agreePop.vue

@@ -2,7 +2,7 @@
   <view>
     <u-popup :show="show" @close="$emit('close')" mode="center" round="10">
       <view class="content">
-        <text>请确认是否退款</text>
+        <text>{{ title }}</text>
         <view class="btn-list">
           <button class="btn-1" @click="$emit('close')">取消</button>
           <button class="btn-2" @click="$emit('refund', 1)">确认</button>
@@ -18,6 +18,10 @@ export default {
       typeof: Boolean,
       default: false,
     },
+    title: {
+      typeof: String,
+      default: "",
+    },
   },
   data() {
     return {};

pageD/afterSalesManage/component/detailCard.vue

@@ -44,8 +44,13 @@
         <text style="font-size: 28rpx">买家实付</text>
         <view class="price">
           <text style="font-size: 20rpx">￥</text>
-          <text>133</text>.
-          <text style="font-size: 20rpx">22</text>
+          <text>{{
+            itemInfo.order_goods.total_amount.toFixed(2).split(".")[0]
+          }}</text
+          >.
+          <text style="font-size: 20rpx">{{
+            itemInfo.order_goods.total_amount.toFixed(2).split(".")[1]
+          }}</text>
         </view>
       </view>
     </view>
@@ -74,7 +79,13 @@
       >
         同意退款
       </button>
-      <button class="btn-2" v-if="itemInfo.status == 1">删除</button>
+      <button
+        class="btn-2"
+        v-if="itemInfo.status == 1"
+        @click.stop="$emit('openPop', itemInfo)"
+      >
+        删除
+      </button>
       <button class="btn-2" v-if="itemInfo.status == 1">查看详情</button>
     </view>
   </view>

pageD/commodityManage/commodityManage.vue

@@ -74,6 +74,8 @@
               :status="status"
               :itemInfo="item"
               @toDetail="toDetail"
+              @deleteGoods="deleteGoods"
+              @addAndRemove="addAndRemove"
             />
           </view>
         </view>
@@ -123,6 +125,7 @@
       :selectGoodsInformation="selectGoodsInformation"
     />
 
+    <agreePopup :agreeShow="agreeShow" :title="title" @close="closeDelete" />
     <u-toast ref="uToast"></u-toast>
   </view>
 </template>
@@ -132,12 +135,14 @@ import GoodsInformation from "./component/goodsInformation.vue";
 import ScreenPopup from "./component/screenPopup.vue";
 import DiscountsPopup from "./component/discountsPopup.vue";
 import BatchDiscountPopup from "./component/batchDiscountPopup.vue";
+import agreePopup from "../components/agreePopup";
 export default {
   components: {
     GoodsInformation,
     ScreenPopup,
     DiscountsPopup,
     BatchDiscountPopup,
+    agreePopup,
   },
   data() {
     return {
@@ -154,6 +159,9 @@ export default {
       source: "",
       selectedGoods: [],
       userId: "",
+      agreeShow: false,
+      needDeleteGoods: {},
+      title: "",
     };
   },
   computed: {
@@ -190,6 +198,62 @@ export default {
     },
   },
   methods: {
+    //删除商品
+    deleteGoods(value) {
+      console.log(value);
+      this.agreeShow = true;
+      this.title = "是否删除商品";
+      this.needDeleteGoods = value;
+    },
+
+    //关闭确认弹窗
+    closeDelete(value) {
+      this.agreeShow = false;
+      if (value) {
+        if (this.title == "是否下架商品") {
+          this.goodsApi(this.needDeleteGoods, "down");
+        } else {
+          uni.$u.http
+            .post(`/api/goods/merchant_goods_del`, {
+              merchant_goods_id: this.needDeleteGoods.id,
+            })
+            .then((res) => {
+              this.getCommodityList();
+              uni.showToast({
+                title: "商品已删除",
+                icon: "none",
+              });
+            });
+        }
+      }
+    },
+
+    //商品上架 下架的接口调用
+    goodsApi(item, value) {
+      uni.$u.http
+        .post(`/api/goods/modify_status`, {
+          merchant_goods_id: item.id,
+          status: value,
+        })
+        .then((res) => {
+          uni.showToast({
+            title: value == "down" ? "商品已下架" : "商品已上架",
+          });
+          this.getCommodityList();
+        });
+    },
+
+    //商品上架 or 下架
+    addAndRemove(item, value) {
+      if (value == "down") {
+        this.title = "是否下架商品";
+        this.agreeShow = true;
+        // this.goodsApi(item, value);
+        this.needDeleteGoods = item;
+      } else {
+        this.goodsApi(item, value);
+      }
+    },
     //切换横向tab栏
     tabSwitch(num) {
       this.follow = num;

pageD/commodityManage/component/goodsInformation.vue

@@ -56,11 +56,27 @@
       >
         我要打折
       </button>
-      <button class="btn-1" v-if="itemInfo.goods.status == 'normal'">
+      <button
+        class="btn-1"
+        v-if="itemInfo.goods.status == 'normal'"
+        @click.stop="$emit('addAndRemove', itemInfo, 'down')"
+      >
         下架
       </button>
-      <button class="btn-1" v-if="itemInfo.goods.status == 'down'">删除</button>
-      <button class="btn-1" v-if="itemInfo.goods.status == 'down'">上架</button>
+      <button
+        class="btn-1"
+        v-if="itemInfo.goods.status == 'down'"
+        @click.stop="$emit('deleteGoods', itemInfo)"
+      >
+        删除
+      </button>
+      <button
+        class="btn-1"
+        v-if="itemInfo.goods.status == 'down'"
+        @click.stop="$emit('addAndRemove', itemInfo, 'normal')"
+      >
+        上架
+      </button>
       <!-- <button class="btn-2" v-if="itemInfo.goods.status == 'down'">编辑</button> -->
     </view>
   </view>

pageD/components/agreePopup.vue

@@ -11,7 +11,7 @@
         <view class="title"> {{ title }} </view>
         <view class="btn-list">
           <button class="btn-2" @click="$emit('close')">取消</button>
-          <button class="btn-1" @click="$emit('close')">提交</button>
+          <button class="btn-1" @click="$emit('close', true)">提交</button>
         </view>
       </view>
     </u-popup>

pageD/components/goodsInformation.vue

@@ -51,14 +51,30 @@
           <text>{{ itemInfo.labels.join(" | ") }} </text>
         </view>
 
-        <!-- <view class="commodity-price">
+        <view class="commodity-price" v-if="productAndCommodity == 'product'">
+          <text style="font-size: 20rpx">￥</text>
+          <text>{{ itemInfo.discount_price.split(".")[0] }}</text
+          >.
+          <text style="font-size: 20rpx">{{
+            itemInfo.discount_price.split(".")[1]
+          }}</text>
+          <text
+            style="
+              font-size: 24rpx;
+              color: #ccc;
+              text-decoration-line: line-through;
+            "
+            >￥{{ itemInfo.price }}</text
+          >
+        </view>
+        <view v-else class="commodity-price">
           <text style="font-size: 20rpx">￥</text>
           <text>{{ itemInfo.price.split(".")[0] }}</text
           >.
           <text style="font-size: 20rpx">{{
             itemInfo.price.split(".")[1]
           }}</text>
-        </view> -->
+        </view>
       </view>
     </view>
     <view class="btn-list" v-if="!batch && productAndCommodity == 'product'">
@@ -71,7 +87,16 @@
       <button class="btn-1" v-if="itemInfo.review_status == 0">查看详情</button>
       <!-- <button class="btn-2" v-if="itemInfo.review_status == 2">重新提交</button> -->
       <!-- <button class="btn-1" v-if="itemInfo.status == 'down'">编辑</button> -->
-      <button class="btn-1" v-if="itemInfo.status == 'down'">上架商品</button>
+      <button
+        class="btn-1"
+        v-if="
+          itemInfo.review_status != '0' &&
+          itemInfo.review_status != '2' &&
+          itemInfo.status == 'down'
+        "
+      >
+        上架商品
+      </button>
     </view>
     <view class="btn-list" v-if="!batch && productAndCommodity == 'commodity'">
       <button

pageD/deliverGoods/deliverGoods.vue

@@ -98,11 +98,12 @@ export default {
   methods: {
     //扫描二维码
     scanningNumber() {
+      let _this = this;
       //获取手机权限
       uni.authorize({
         scope: "scope.camera",
         success() {
-          scanQrCode();
+          _this.scanQrCode();
         },
         fail() {
           //用户拒绝授权

pageD/evaluate/evaluate.vue

@@ -1,140 +1,203 @@
 <template>
-	<view>
-		<view class="content">
-			<view class="rate">
-				<view class="_label">
-					商品评价
-				</view>
-				<u-rate :count="count" v-model="value" size="22"></u-rate>
-			</view>
-			<view class="_text">
-				<u--textarea border='none' v-model="value1" height="150" placeholder="展开说说对商品的想法"></u--textarea>
-			</view>
-			<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="10">
-				<view class="upload-photo">
-					<u-icon name="camera" size="26"></u-icon>
-					<text>添加图片/视频</text>
-				</view>
-			</u-upload>
-		</view>
-		<button class="btn-1">提交评价</button>
-	</view>
+  <view>
+    <view class="content" v-for="item in orderDetail.goods">
+      <view class="goods-title">
+        <image class="goods-img" :src="item.goods_image" mode="scaleToFill" />
+        <view class="title"> 立白大师香氛洗衣液持久留香香水机洗护理洗… </view>
+      </view>
+      <view class="rate">
+        <view class="_label"> 商品评价 </view>
+        <u-rate :count="count" v-model="value" size="22"></u-rate>
+      </view>
+
+      <u-upload
+        :fileList="fileList1"
+        @afterRead="afterRead"
+        @delete="deletePic"
+        name="1"
+        multiple
+        :maxCount="10"
+      >
+        <view class="upload-photo">
+          <u-icon name="camera" size="26"></u-icon>
+          <text>添加图片/视频</text>
+        </view>
+      </u-upload>
+      <view class="_text">
+        <u--textarea
+          border="none"
+          v-model="value1"
+          height="150"
+          placeholder="展开说说对商品的想法"
+        ></u--textarea>
+      </view>
+    </view>
+    <button class="btn-1" @click="submit">提交评价</button>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				count: 5,
-				value: 1,
-				value1: "",
-				fileList1: [],
-			};
-		},
-		methods: {
-			// 删除图片
-			deletePic(event) {
-				this[`fileList${event.name}`].splice(event.index, 1)
-			},
-			// 新增图片
-			async afterRead(event) {
-				console.log(event)
-				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-				let lists = [].concat(event.file)
-				let fileListLen = this[`fileList${event.name}`].length
-				lists.map((item) => {
-					this[`fileList${event.name}`].push({
-						...item,
-						status: 'uploading',
-						message: '上传中'
-					})
-				})
-				for (let i = 0; i < lists.length; i++) {
-					const result = await this.uploadFilePromise(lists[i].url)
-					let item = this[`fileList${event.name}`][fileListLen]
-					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-						status: 'success',
-						message: '',
-						url: result
-					}))
-					fileListLen++
-				}
-			},
-			uploadFilePromise(url) {
-				return new Promise((resolve, reject) => {
-					let a = uni.uploadFile({
-						url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
-						filePath: url,
-						name: 'file',
-						formData: {
-							user: 'test'
-						},
-						success: (res) => {
-							setTimeout(() => {
-								resolve(res.data.data)
-							}, 1000)
-						}
-					});
-				})
-			},
-		},
-		mounted() {
-			uni.setNavigationBarTitle({
-				title: '评价'
-			})
-		}
-	}
+export default {
+  data() {
+    return {
+      count: 5,
+      value: 5,
+      value1: "",
+      fileList1: [],
+      status: "",
+      orderDetail: {},
+    };
+  },
+  onLoad(options) {
+    this.status = options.orderId;
+    this.getDetail();
+  },
+  methods: {
+    //提交评价
+    submit() {
+      let imgList = [];
+      this.fileList1.map((item) => {
+        imgList.push(item.thumb);
+      });
+      uni.$u.http
+        .post(`/api/order/comment`, {
+          order_goods_id: this.orderDetail.goods[0].id,
+          content: this.value1,
+          score: this.value,
+          image: imgList.join(","),
+          video: "",
+        })
+        .then((res) => {
+          console.log(res);
+        });
+    },
+    // 删除图片
+    deletePic(event) {
+      this[`fileList${event.name}`].splice(event.index, 1);
+    },
+    // 新增图片
+    async afterRead(event) {
+      console.log(event);
+      // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+      let lists = [].concat(event.file);
+      let fileListLen = this[`fileList${event.name}`].length;
+      lists.map((item) => {
+        this[`fileList${event.name}`].push({
+          ...item,
+          status: "uploading",
+          message: "上传中",
+        });
+      });
+      for (let i = 0; i < lists.length; i++) {
+        const result = await this.uploadFilePromise(lists[i].url);
+        let item = this[`fileList${event.name}`][fileListLen];
+        this[`fileList${event.name}`].splice(
+          fileListLen,
+          1,
+          Object.assign(item, {
+            status: "success",
+            message: "",
+            url: result,
+          })
+        );
+        fileListLen++;
+      }
+    },
+    uploadFilePromise(url) {
+      return new Promise((resolve, reject) => {
+        let a = uni.uploadFile({
+          url: `${uni.$u.http.config.baseURL}/api/upload/images`, // 仅为示例，非真实的接口地址
+          filePath: url,
+          name: "file",
+          formData: {
+            user: "test",
+          },
+          success: (res) => {
+            setTimeout(() => {
+              resolve(res.data.data);
+            }, 1000);
+          },
+        });
+      });
+    },
+    getDetail() {
+      uni.$u.http.get(`/api/order/read?id=${this.status}`).then((res) => {
+        this.orderDetail = res;
+      });
+    },
+  },
+  mounted() {
+    uni.setNavigationBarTitle({
+      title: "评价",
+    });
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.content {
-		background-color: #fff;
-		padding: 40rpx 24rpx;
-
-		.rate {
-			display: flex;
-			align-items: center;
+.content {
+  background-color: #fff;
+  padding: 40rpx 24rpx;
+  .goods-title {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .goods-img {
+      width: 52rpx;
+      height: 52rpx;
+      border-radius: 6rpx;
+    }
+    .title {
+      font-size: 24rpx;
+      color: rgba(51, 51, 51, 0.5);
+      margin-left: 20rpx;
+    }
+  }
 
-			._label {
-				font-size: 32rpx;
-				font-weight: 600;
-				margin-right: 22rpx;
-			}
-		}
+  .rate {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
 
-		._text {
-			margin-top: 32rpx;
-			padding-top: 26rpx;
-			border-top: 2rpx solid rgba(151, 151, 151, .1);
+    ._label {
+      font-size: 32rpx;
+      font-weight: 600;
+      margin-right: 22rpx;
+    }
+  }
 
-		}
+  ._text {
+    margin-top: 32rpx;
+    padding-top: 26rpx;
+    border-top: 2rpx solid rgba(151, 151, 151, 0.1);
+  }
 
-		.upload-photo {
-			width: 180rpx;
-			height: 180rpx;
-			border: 2rpx dashed #979797;
-			border-radius: 8rpx;
-			display: flex;
-			align-items: center;
-			flex-direction: column;
-			justify-content: center;
-			font-size: 24rpx;
-			color: rgba(34, 34, 34, .8);
-		}
+  .upload-photo {
+    width: 180rpx;
+    height: 180rpx;
+    border: 2rpx dashed #979797;
+    border-radius: 8rpx;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    font-size: 24rpx;
+    color: rgba(34, 34, 34, 0.8);
+  }
 
-		::v-deep .u-textarea {
-			background-color: #fff;
-		}
-	}
-	.btn-1{
-		background-color: #f83224;
-		color: #fff;
-		border-radius: 40rpx;
-		height: 80rpx;
-		line-height: 80rpx;
-		width: 90%;
-		margin: 0 auto;
-		margin-top: 70rpx;
-		font-size: 32rpx;
-	}
-</style>
+  ::v-deep .u-textarea {
+    background-color: #fff;
+  }
+}
+.btn-1 {
+  background-color: #f83224;
+  color: #fff;
+  border-radius: 40rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  width: 90%;
+  margin: 0 auto;
+  margin-top: 70rpx;
+  font-size: 32rpx;
+}
+</style>

pageD/orderDetail/orderDetail.vue

@@ -169,7 +169,7 @@ export default {
     //跳转发货页面
     toSendOutGoods() {
       uni.navigateTo({
-        url: "/pageD/deliverGoods/deliverGoods",
+        url: `/pageD/deliverGoods/deliverGoods?id=${this.orderDetail.id}`,
       });
     },
   },

pageD/orderFormManage/component/detailCard.vue

@@ -7,7 +7,11 @@
       </view>
       <text class="order-status">{{ deliveryStatus }}</text>
     </view>
-    <view class="order-detail" :style="model" v-for="item in itemInfo.goods">
+    <view
+      class="order-detail"
+      :style="model"
+      v-for="item in itemInfo.order_goods"
+    >
       <view class="detail">
         <image class="order-img" :src="item.goods_image" mode=""></image>
         <view class="detail-right">
@@ -30,7 +34,7 @@
       </view>
       <view class="price-detail">
         <view style="color: #222; font-size: 24rpx">
-          <text>共{{ itemInfo.goods.length }}</text>
+          <text>共{{ itemInfo.order_goods.length }}</text>
           <text>
             {{ "件商品" + "&nbsp;" }}
           </text>

pageD/orderFormManage/orderFormManage.vue

@@ -10,44 +10,44 @@
       ></u--input>
       <view class="top-tab">
         <view
-          :class="{ commodity: follow == 1 }"
+          :class="{ commodity: follow == '' }"
           class="tab"
-          @click="tabSwitch(1)"
+          @click="tabSwitch('')"
         >
           全部
         </view>
         <view
-          :class="{ commodity: follow == 2 }"
+          :class="{ commodity: follow == 'unreview' }"
           class="tab"
-          @click="tabSwitch(2)"
+          @click="tabSwitch('unreview')"
         >
           待审核
         </view>
         <view
-          :class="{ commodity: follow == 3 }"
+          :class="{ commodity: follow == 'unfill' }"
           class="tab"
-          @click="tabSwitch(3)"
+          @click="tabSwitch('unfill')"
         >
           待缴纳保证金
         </view>
         <view
-          :class="{ commodity: follow == 4 }"
+          :class="{ commodity: follow == 'merdelivered' }"
           class="tab"
-          @click="tabSwitch(4)"
+          @click="tabSwitch('merdelivered')"
         >
           待团长发货
         </view>
         <view
-          :class="{ commodity: follow == 5 }"
+          :class="{ commodity: follow == 'undelivered' }"
           class="tab"
-          @click="tabSwitch(5)"
+          @click="tabSwitch('undelivered')"
         >
           待总部发货
         </view>
         <view
-          :class="{ commodity: follow == 6 }"
+          :class="{ commodity: follow == 'delivered' }"
           class="tab"
-          @click="tabSwitch(6)"
+          @click="tabSwitch('delivered')"
         >
           已发货
         </view>
@@ -69,13 +69,15 @@ export default {
   },
   data() {
     return {
-      follow: 1,
+      follow: "",
       orderList: [],
+      page: 1,
     };
   },
   methods: {
     tabSwitch(num) {
       this.follow = num;
+      this.getGoodsList();
     },
     toInformation(item) {
       if (item.delivery_status == "unreview") return;
@@ -83,11 +85,15 @@ export default {
         url: `/pageD/orderDetail/orderDetail?orderStatus=${item.id}`,
       });
     },
+    //获取订单列表
     getGoodsList() {
       uni.$u.http
-        .post(`/api/order/merchant_order`, { page: 1, limit: 10 })
+        .post(`/api/order/merchant_order`, {
+          page: this.page,
+          limit: 10,
+          status: this.follow,
+        })
         .then((res) => {
-          console.log(res);
           this.orderList = res.data;
         });
     },

pageD/orderInformation/orderInformation.vue

@@ -243,7 +243,10 @@ export default {
           });
           this.orderDetail = "商品已打包称重，等待用户付款";
           this.orderTitle = "待付款";
-        } else if (this.orderInformation.status == "overseas_undelivered") {
+        } else if (
+          this.orderInformation.status == "overseas_undelivered" ||
+          this.orderInformation.status == "domestic_undelivered"
+        ) {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
             frontColor: "#000000",
@@ -268,7 +271,10 @@ export default {
           uni.setNavigationBarTitle({
             title: "拼包详情",
           });
-        } else if (this.orderInformation.status == "finished") {
+        } else if (
+          this.orderInformation.status == "finished" ||
+          this.orderInformation.status == "overseas_received"
+        ) {
           //设置顶部标题栏颜色
           uni.setNavigationBarColor({
             frontColor: "#000000",
@@ -276,6 +282,38 @@ export default {
           });
           this.orderDetail = "订单签收，交易已完成";
           this.orderTitle = "已完成";
+        } else if (this.orderInformation.status == "domestic_received") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "等待中转称重发出";
+          this.orderTitle = "中转已签收";
+        } else if (this.orderInformation.status == "closed") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "订单关闭";
+          this.orderTitle = "订单已关闭";
+        } else if (this.orderInformation.status == "refunded") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "订单已退款";
+          this.orderTitle = "已退款";
+        } else if (this.orderInformation.status == "refunding") {
+          //设置顶部标题栏颜色
+          uni.setNavigationBarColor({
+            frontColor: "#000000",
+            backgroundColor: "#f4f4f4",
+          });
+          this.orderDetail = "订单正在申请退款";
+          this.orderTitle = "退款中";
         }
       });
     },

pageD/productDetails/productDetails.vue

@@ -35,6 +35,16 @@
       <text style="font-size: 18rpx">{{
         commodityDetail.discount_price.split(".")[1]
       }}</text>
+
+      <text
+        style="
+          font-size: 24rpx;
+          color: #ccc;
+          text-decoration-line: line-through;
+        "
+      >
+        ￥{{ commodityDetail.price }}
+      </text>
     </view>
     <view class="goods-title">
       {{ commodityDetail.name_cn }}
@@ -79,6 +89,7 @@ export default {
     };
   },
   onLoad(options) {
+    console.log(options);
     this.goodsId = options.goodsId;
     this.pageStatus = options.pageStatus;
     if (options.pageStatus == "platform") {

pageD/supplyChainGoods/supplyChainGoods.vue

@@ -102,7 +102,7 @@ export default {
     //跳转商品详情
     toDetail(value) {
       uni.navigateTo({
-        url: `/pageD/productDetails/productDetails?goodsId=${value.id}`,
+        url: `/pageD/productDetails/productDetails?goodsId=${value.id}&pageStatus=platform`,
       });
     },
     //获取供应链商品列表

pages/cart/cart.vue

@@ -97,9 +97,7 @@
                   class="good"
                   style="flex: 1; margin-left: 10rpx; width: 65%"
                 >
-                  <view class="goodname" >{{
-                    chid.name_cn
-                  }}</view>
+                  <view class="goodname">{{ chid.name_cn }}</view>
                   <view class="goods" v-if="chid.sku_item.length > 0">{{
                     chid.sku_item[0].item
                   }}</view>
@@ -214,6 +212,8 @@
       @allSelect="allSelect"
       :goodsWeight="goodsWeight"
       :goodsPrice="String(goodsPrice.toFixed(2))"
+      :goodsList="goodsList"
+      :checkboxValue1="checkboxValue1"
     ></kj-tabbar>
   </view>
 </template>
@@ -515,8 +515,9 @@ export default {
     height: 88rpx;
     background-color: #fff;
     border-radius: 50%;
-    bottom: 210rpx;
+    bottom: 280rpx;
     right: 20rpx;
+    z-index: 1000;
     .back-icon {
       width: 32rpx;
       height: 30rpx;

pages/login/login.vue

@@ -16,6 +16,7 @@
 		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
 			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
+<<<<<<< HEAD
 		</view>
 		<button @click="submit">登录</button>
 		<button @click="submita">注册</button>
@@ -30,6 +31,29 @@
 			<text class="fontYin" style="color: #f83224">《隐私协议》</text>
 		</view>
 	</view>
+=======
+		</view> -->
+    <button @click="submit">登录</button>
+    <view class="" style="margin-top: 42rpx; display: flex">
+      <u-checkbox-group
+        v-model="checkboxValue1"
+        placement="column"
+        @change="checkboxChange"
+      >
+        <u-checkbox
+          shape="circle"
+          :customStyle="{ marginBottom: '8px' }"
+          :name="1"
+        >
+        </u-checkbox>
+      </u-checkbox-group>
+      <text class="fontYin">我已阅读并同意</text>
+      <text class="fontYin" style="color: #f83224">《用户协议》</text>
+      <text class="fontYin">和</text>
+      <text class="fontYin" style="color: #f83224">《隐私协议》</text>
+    </view>
+  </view>
+>>>>>>> 1ef0e2f26ceef3fa675ea80234177479c376fa52
 </template>
 
 <script>

unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js

@@ -229,7 +229,7 @@ var _vuex = __webpack_require__(/*! vuex */ 856);
 //
 //
 //
-var _default = {
+var _default2 = {
   name: "kj-tabbar",
   props: {
     value1: {
@@ -243,6 +243,20 @@ var _default = {
     goodsPrice: {
       type: String,
       default: ""
+    },
+    //购物车所有商品
+    goodsList: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
+    //购物车选中的商品
+    checkboxValue1: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
     }
   },
   computed: {
@@ -290,6 +304,8 @@ var _default = {
   },
   methods: {
     account: function account() {
+      console.log(this.checkboxValue1);
+      console.log(this.goodsList);
       uni.navigateTo({
         url: "/pageA/order"
       });
@@ -342,7 +358,6 @@ var _default = {
       }
     },
     click1: function click1(e) {
-      console.log(e);
       if (e == 4) {
         uni.switchTab({
           url: "../../pages/mine/mine"
@@ -410,7 +425,7 @@ var _default = {
   // 	}
   // }
 };
-exports.default = _default;
+exports.default = _default2;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -97,44 +97,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
-var components
-try {
-  components = {
-    "u-Input": function () {
-      return Promise.all(/*! import() | uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u--input/u--input.vue */ 959))
-    },
-    uCheckboxGroup: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 910))
-    },
-    uCheckbox: function () {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 936))
-    },
-  }
-} catch (e) {
-  if (
-    e.message.indexOf("Cannot find module") !== -1 &&
-    e.message.indexOf(".vue") !== -1
-  ) {
-    console.error(e.message)
-    console.error("1. 排查组件名称拼写是否正确")
-    console.error(
-      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
-    )
-    console.error(
-      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
-    )
-  } else {
-    throw e
-  }
-}
-var render = function () {
-  var _vm = this
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
-}
-var recyclableRender = false
+var render = function () {}
 var staticRenderFns = []
-render._withStripped = true
+var recyclableRender
+var components
 
 
 
@@ -205,6 +171,30 @@ var _homeApi = __webpack_require__(/*! ../../network/api/homeApi.js */ 211);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {