From e66db9a9ecdb88ad96676d4b216118db0633f49a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 15 Dec 2023 19:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/admin.js                                  |   34 +
 api/order.js                                  |   37 +
 components/orderGoods/index.vue               |    8 +-
 components/shortPopup.vue                     |    4 +-
 pages.json                                    |   58 +-
 pages/admin/delivery/indexOther.vue           |  851 ++++++
 pages/admin/orderDetail/indexOther.vue        |  991 +++++++
 pages/admin/orderList/indexOther.vue          | 1007 +++++++
 pages/index/index.vue                         |   86 +-
 pages/moreProject/moreProject.vue             |    4 +
 pages/nongKe/cloud_entrepot/indexOther.vue    | 1931 ++++++++++++
 pages/nongKe/cloud_entrepot/indexb.vue        |    2 +-
 .../supply_chain/shopping_trolley_other.vue   | 1370 +++++++++
 pages/order_details/indexOther.vue            | 1771 +++++++++++
 pages/users/order_confirm/indexOther.vue      | 2606 +++++++++++++++++
 pages/users/order_list/indexOther.vue         | 1333 +++++++++
 pages/users/supply_procurement/index.vue      |   34 +-
 17 files changed, 12108 insertions(+), 19 deletions(-)
 create mode 100644 pages/admin/delivery/indexOther.vue
 create mode 100644 pages/admin/orderDetail/indexOther.vue
 create mode 100644 pages/admin/orderList/indexOther.vue
 create mode 100644 pages/nongKe/cloud_entrepot/indexOther.vue
 create mode 100644 pages/nongKe/supply_chain/shopping_trolley_other.vue
 create mode 100644 pages/order_details/indexOther.vue
 create mode 100644 pages/users/order_confirm/indexOther.vue
 create mode 100644 pages/users/order_list/indexOther.vue

diff --git a/api/admin.js b/api/admin.js
index c94d3bc..6c6db6b 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -74,6 +74,14 @@ export function getAdminOrderDetail(merId, orderId) {
 		login: true
 	});
 }
+/**
+ * 其他订单详情
+ */
+export function getAdminOtherOrderDetail(merId, orderId) {
+	return request.get("admin/other/" + merId + "/order/" + orderId, {}, {
+		login: true
+	});
+}
 /**
  * 订单发货信息获取
  */
@@ -91,6 +99,15 @@ export function setAdminOrderDelivery(merId, id, data) {
 		login: true
 	});
 }
+/**
+ * 其他订单发货保存
+ */
+export function setAdminOtherOrderDelivery(merId, id, data) {
+	return request.post("admin/other/" + merId + "/delivery/" + id, data, {
+		login: true
+	});
+}
+
 /**
  * 订单统计图
  */
@@ -149,6 +166,13 @@ export function verifierOrder(mer_id, code) {
 export function orderStatistics(mer_id, data) {
 	return request.get("admin/" + mer_id + "/statistics", data);
 }
+/**
+ * 其他订单统计数
+ * @returns {*}
+ */
+export function otherOrderStatistics(mer_id, data) {
+	return request.get("admin/other/" + mer_id + "/statistics", data);
+}
 /**
  * 订单
  * @returns {*}
@@ -174,6 +198,15 @@ export function getOrderList(where, merId) {
 		login: true
 	});
 }
+/**
+ * 其他订单列表
+ * @returns {*}
+ */
+export function getOtherOrderList(where, merId) {
+	return request.get(`admin/other/${merId}/order_list`, where, {
+		login: true
+	});
+}
 /**
  * 退款订单列表
  * @returns {*}
@@ -270,6 +303,7 @@ export function setRefundMark(merId, orderId, data) {
 		login: true
 	});
 }
+
 /**
  * 去核销
  * @param object data
diff --git a/api/order.js b/api/order.js
index 8cc746e..c880635 100644
--- a/api/order.js
+++ b/api/order.js
@@ -47,6 +47,14 @@ export function getOrderList(data) {
   return request.get('order/list', data);
 }
 
+/**
+ * 其他订单列表
+ * @param object data
+ */
+export function getOtherOrderList(data) {
+  return request.get('other_order/list', data);
+}
+
 /**
  * 订单产品信息
  * @param string unique 
@@ -78,6 +86,13 @@ export function orderPay(id, data) {
 export function orderData(data) {
   return request.get('order/number', data)
 }
+/**
+ * 其他订单统计数据
+ */
+export function otherOrderData(data) {
+  return request.get('other_order/number', data)
+}
+
 
 /**
  * 订单取消
@@ -114,6 +129,14 @@ export function getOrderDetail(uni) {
   return request.get('order/detail/' + uni);
 }
 
+/**
+ * 其他订单详情
+ * @param string uni 
+ */
+export function getOtherOrderDetail(uni) {
+  return request.get('other_order/detail/' + uni);
+}
+
 /**
  * 未付款订单详情
  * @param string uni 
@@ -145,6 +168,16 @@ export function orderTake(uni) {
   return request.post('order/take/' + uni);
 }
 
+/**
+ * 其他订单收货
+ * @param string uni
+ * 
+ */
+export function otherOrderTake(uni) {
+  return request.post('other_order/take/' + uni);
+}
+
+
 /**
  * 订单查询物流信息
  * @returns {*}
@@ -218,6 +251,10 @@ export function orderCreate(data) {
 export function createOrder(data) {
   return request.post("v2/order/create", data, { noAuth: true });
 }
+// 生成其他订单
+export function createOtherOrder(data) {
+  return request.post("other_order/create", data);
+}
 // 未支付订单
 export function groupOrderList(data) {
   return request.get("order/group_order_list", data, { noAuth: true });
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index caab887..cf565bf 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -106,7 +106,7 @@
 						</view>
 					</view>
 
-					<view class="right-btn-box">
+					<view class="right-btn-box" v-if="btn">
 						<view class="btn-item err" v-if="item.is_refund ==1">退款中 x
 							{{item.product_num - item.refund_num}}</view>
 						<view class='btn-item err' v-if="item.is_refund >1">已退款 x {{item.product_num - item.refund_num}}
@@ -181,7 +181,11 @@
       order_status:{
         type: Number,
         default: 0,
-      }
+      },
+      btn:{
+				type: Boolean,
+				default: true,
+			},
 		},
 		computed: mapGetters(['viewColor']),
 		data() {
diff --git a/components/shortPopup.vue b/components/shortPopup.vue
index ce7c88b..f3e1124 100644
--- a/components/shortPopup.vue
+++ b/components/shortPopup.vue
@@ -73,12 +73,12 @@
     postCartAdd,
     getProductDetail
   } from '@/api/store.js';
-import { Toast } from '../libs/uniApi';
+  import { Toast } from '../libs/uniApi';
   export default {
     name: "shortPopup",
     props: {
       source:{
-        type: Number,
+        type: String | Number,
         default: null
       }
     },
diff --git a/pages.json b/pages.json
index 8c680db..1ea86ee 100644
--- a/pages.json
+++ b/pages.json
@@ -91,6 +91,12 @@
         "navigationBarTitleText": "采购车"
       }
     },
+    {
+      "path": "pages/nongKe/supply_chain/shopping_trolley_other",
+      "style": {
+        "navigationBarTitleText": "采购车"
+      }
+    },
     {
       "path": "pages/moreProject/moreProject",
       "style": {
@@ -304,6 +310,18 @@
             // #endif
           }
         },
+        {
+            "path": "indexOther",
+            "style": {
+              "navigationBarTitleText": "订单详情"
+              //,
+              //"navigationBarBackgroundColor": "#e93323"
+              // #ifdef MP || APP-PLUS
+              //	,
+              //"navigationBarTextStyle": "#fff"
+              // #endif
+            }
+          },
         {
           "path": "stay",
           "style": {
@@ -441,7 +459,13 @@
             "navigationBarTitleText": "供货采购",
             "enablePullDownRefresh": true
           }
-
+        },{
+          "path": "cloud_entrepot/indexOther",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "供货采购",
+            "enablePullDownRefresh": true
+          }
         }, {
           "path": "teach_video/teach_video",
           "style": {
@@ -711,6 +735,12 @@
             "navigationBarTitleText": "提交订单"
           }
         },
+        {
+          "path": "order_confirm/indexOther",
+          "style": {
+            "navigationBarTitleText": "提交订单"
+          }
+        },
         {
           "path": "goods_details_store/index",
           "style": {
@@ -753,6 +783,12 @@
             "navigationBarTitleText": "采购订单"
           }
         },
+        {
+          "path": "order_list/indexOther",
+          "style": {
+            "navigationBarTitleText": "赊账订单"
+          }
+        },
         {
           "path": "order_list/relase",
           "style": {
@@ -1150,7 +1186,13 @@
           "style": {
             "navigationBarTitleText": "订单列表"
           }
-        }, {
+        },
+        {
+          "path": "orderList/indexOther",
+          "style": {
+            "navigationBarTitleText": "订单列表"
+          }
+        },{
           "path": "financial_management/index",
           "style": {
             "navigationBarTitleText": "财务管理"
@@ -1175,6 +1217,12 @@
             "navigationBarTitleText": "订单详情"
           }
         },
+        {
+          "path": "orderDetail/indexOther",
+          "style": {
+            "navigationBarTitleText": "订单详情"
+          }
+        },
         {
           "path": "refundDetail/index",
           "style": {
@@ -1187,6 +1235,12 @@
             "navigationBarTitleText": "订单发货"
           }
         },
+        {
+          "path": "delivery/indexOther",
+          "style": {
+            "navigationBarTitleText": "订单发货"
+          }
+        },
         {
           "path": "statistics/index",
           "style": {
diff --git a/pages/admin/delivery/indexOther.vue b/pages/admin/delivery/indexOther.vue
new file mode 100644
index 0000000..ddf84bc
--- /dev/null
+++ b/pages/admin/delivery/indexOther.vue
@@ -0,0 +1,851 @@
+<template>
+	<view class="deliver-goods" :style="viewColor">
+		<header>
+			<view class="order-num acea-row row-between-wrapper">
+				<view class="num line1">订单号：{{ delivery.order_sn }}</view>
+				<view class="name line1">
+					<span class="iconfont icon-yonghu2"></span>{{ delivery.user && delivery.user.nickname }}
+				</view>
+			</view>
+			<view class="address">
+				<view class="name">
+					{{ delivery.real_name }}<span class="phone">{{ delivery.user && delivery.user_phone }}</span>
+				</view>
+				<view>{{ delivery.user_address }}</view>
+			</view>
+			<view class="line">
+				<image :src="`${domain}/static/images/line.jpg`" />
+			</view>
+		</header>
+		<view class="wrapper">
+			<view class="item acea-row row-between-wrapper">
+				<view>发货方式</view>
+				<view class="mode acea-row row-middle row-right">
+					<view class="goods" :class="active === index ? 'on' : ''" v-for="(item, index) in types" :key="index" @click="changeType(item, index)">
+						<span class="iconfont icon-xuanzhong2"></span>{{ item.title }}
+					</view>
+				</view>
+			</view>
+			<block v-if="logistics.length>0">
+				<view class="list">	
+					<block v-if="delivery_type == 1">
+						<view class="item acea-row row-between-wrapper">
+							<view>快递公司</view>
+							<view class="select-box">
+								<picker class="pickerBox" @change="bindPickerChange" :value="seIndex" :range="logistics" range-key="label">
+									<view class="uni-input">{{logistics[seIndex].label}}</view>
+								</picker>
+							</view>
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>快递单号</view>
+							<input type="text" placeholder="填写快递单号" v-model="delivery_id" class="mode" />
+							<!-- #ifdef MP -->
+							<text class="iconfont icon-xiangji" @click="scanCode"></text>
+							<!-- #endif -->
+							<!-- #ifdef H5 -->
+							<text v-if="isWeixin" class="iconfont icon-xiangji" @click="scanCode"></text>
+							<!-- #endif -->
+						</view>
+					</block>
+					<block v-if="delivery_type == 4">
+						<view class="item acea-row row-between-wrapper">
+							<view>快递公司</view>
+							<view class="select-box">
+								<picker class="pickerBox" @change="bindPickerChange" :value="seIndex" :range="logistics" range-key="label">
+									<view class="uni-input">{{logistics[seIndex].label}}</view>
+								</picker>
+							</view>
+						</view>
+						<view class="item acea-row row-between-wrapper" v-if="expTemp.length > 0 && delivery_type == 4">
+							<view>电子面单</view>
+							<div style="display: flex;align-items: center;">
+								<picker class="pickerBox" @change="bindTempChange" :value="expIndex" :range="expTemp" range-key="title">
+									<view class="uni-input input-inline">{{expTemp[expIndex].title}}</view>
+								</picker>
+								<div class="look" @click="previewImage">预览</div>
+							</div>	
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>寄件人姓名</view>
+							<input type="text" placeholder="填写寄件人姓名" v-model="from_name" class="mode" />
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>寄件人电话</view>
+							<input type="text" placeholder="填写寄件人电话" v-model="from_tel" class="mode" />
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>寄件人地址</view>
+							<input type="text" placeholder="填写寄件人地址" v-model="from_addr" class="mode" />
+						</view>
+					</block>
+				</view>
+			</block>
+			<view class="list" v-if="delivery_type == 2">
+				<view class="item acea-row row-between-wrapper">
+					<view>送货人姓名</view>
+					<input type="text" placeholder="填写送货人姓名" maxlength="10" v-model="to_name" class="mode" />
+				</view>
+				<view class="item acea-row row-between-wrapper">
+					<view>送货人电话</view>
+					<input type="text" placeholder="填写送货人电话" v-model="to_phone" class="mode" />
+				</view>
+			</view>
+			<block v-if="delivery_type == 5">
+				<view class="item acea-row row-between-wrapper">
+					<view>发货点</view>
+					<view class="select-box">
+						<picker class="pickerBox" @change="bindStoreChange" :value="storeIndex" :range="storeList" range-key="label">
+							<view class="uni-input">{{storeList[storeIndex] && storeList[storeIndex].label}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="item acea-row row-between-wrapper">
+					<view>包裹重量</view>
+					<input type="number" placeholder="填写包裹重量" v-model="cargo_weight" class="mode" />
+				</view>
+				<view class="item acea-row row-between-wrapper">
+					<view>配送备注</view>
+					<input type="textarea" placeholder="填写配送备注" v-model="mark" class="mode textarea" />
+				</view>
+			</block>
+			<view class="list">
+				<view class="item acea-row row-between-wrapper">
+					<view>发货备注</view>
+					<input type="textarea" placeholder="填写发货备注" v-model="remark" class="mode textarea" />
+				</view>
+			</view>
+			<block v-if="(delivery.orderProduct) && ((delivery.orderProduct.length > 1) || (delivery.orderProduct.length==1 && delivery.orderProduct[0]['refund_num']>1)) && activity_type != 2">
+				<view class="item acea-row row-between-wrapper">
+					<view>分单发货</view>
+					<view class="mode acea-row row-middle row-right">
+						<view class="goods" :class="curSplit === item.key ? 'on' : ''" v-for="(item, index) in splitList" :key="index" @click="changeSplit(item, index)">
+							<span class="iconfont icon-xuanzhong2"></span>{{ item.title }}
+						</view>
+					</view>
+				</view>
+				<block v-if="curSplit">
+					<view v-for="(item, index) in delivery.orderProduct">
+						<view class="pro_list acea-row">
+							<view class="checkbox" @tap.stop="checkedChange(item)">
+								<text v-if="item.checked" class="iconfont icon-xuanzhong1"></text>
+								<text v-else class="iconfont icon-weixuanzhong"></text>											
+							</view>							
+							<view v-if="item.cart_info && item.cart_info.product" class="picture">
+								<image :src="item.cart_info.product.image"></image>	
+							</view>
+							<view class="info" v-if="item.cart_info && item.cart_info.product">
+								<view class="name line2">{{item.cart_info.product.store_name}}</view>
+								<view class="info_sku" v-if="item.cart_info && item.cart_info.productAttr">{{item.cart_info.productAttr.sku}}</view>
+								<view class="info_price" v-if="item.cart_info && item.cart_info.productAttr">￥<text>{{item.cart_info.productAttr.price}}</text></view>
+								<view class='carnum acea-row row-center-wrapper'>
+									<view class="reduce" :class="item.numSub ? 'on' : ''" @click.stop='subCart(item)'>-</view>
+									<view class='num'>{{item.split_num}}</view>
+									<view class="plus" :class="item.numAdd ? 'on' : ''" @click.stop='addCart(item)'>+</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+			</block>
+			<block v-if="!curSplit">
+				<view class="pro_count" v-if="delivery.orderProduct">
+					<view class="title">共{{delivery.orderProduct.length}}件商品</view>
+					<view v-for="(item, index) in delivery.orderProduct">
+						<view class="pro_list acea-row">						
+							<view v-if="item.cart_info && item.cart_info.product" class="picture">
+								<image :src="item.cart_info.product.image"></image>	
+							</view>
+							<view class="info pro_info" v-if="item.cart_info && item.cart_info.product">
+								<view class="name line2">{{item.cart_info.product.store_name}}</view>
+								<view class="info_sku" v-if="item.cart_info && item.cart_info.productAttr">{{item.cart_info.productAttr.sku}}</view>
+							</view>
+							<view class="pro_price" v-if="item.cart_info && item.cart_info.productAttr">
+								<view class="info_price">￥{{item.cart_info.productAttr.price}}</view>
+								<view class="info_num">x{{item.product_num}}</view>
+								<view class="refund_num" v-if="item.product_num-item.refund_num>0">{{item.product_num-item.refund_num}}件{{item.is_refund==1?'退款中' : item.is_refund==2 ? '已退款' : item.is_refund==3?'全部退款':''}}</view>
+							</view>
+						</view>
+					</view>
+					<!-- <view class="footer">
+						共{{delivery.orderProduct.length}}件商品，应支付<text> ￥{{delivery.pay_price}} </text>（运费￥{{delivery.pay_postage}}）
+					</view> -->
+				</view>
+			</block>
+		</view>
+		<view style="height:5.4rem;"></view>
+		<view class="confirm_btn"><view class="confirm" @click="saveInfo">确认提交</view></view>	
+	</view>
+</template>
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		getAdminOrderDetail,
+    getAdminOtherOrderDetail,
+		setAdminOrderDelivery,
+    setAdminOtherOrderDelivery,
+		orderExportTemp,
+		orderDeliveryInfo,
+		getTempAndDelivery,
+		getDeliveryStoreLst
+	} from "@/api/admin";
+	import { mapGetters } from "vuex";
+	import { expressList } from "@/api/order";
+	import { checkPhone } from '@/utils/validate.js';
+	import { HTTP_REQUEST_URL } from '@/config/app';
+	export default {
+		name: "GoodsDeliver",
+		components: {},
+		props: {},
+		data: function() {
+			return {
+				types: [
+     //      {
+					// 	type: 1,
+					// 	title: "发货"
+					// },
+					{
+						type: 2,
+						title: "送货"
+					},
+					// {
+					// 	type: 3,
+					// 	title: "无需物流"
+					// }
+				],
+				splitList: [
+					{
+						title: '开启',
+						key: 1
+					},
+					{
+						title: '关闭',
+						key: 0
+					}
+				],
+				curSplit: 0,
+				curExpress: 1,
+				active: 0,
+				order_id: "",
+				delivery: {
+					user: {}
+				},
+				logistics: [],
+				delivery_type: 1,
+				delivery_name: "",
+				to_phone: '', //送货人电话
+				to_name: '', //送货人姓名
+				remark: "",
+				mark: "",
+				cargo_weight: 0,
+				delivery_id: "",
+				mer_config_temp_id: "",
+				mer_from_com: "",
+				seIndex: 0,
+				storeIndex: 0,
+				merId: "",
+				expIndex:0,
+				expTemp:[], // 快递模板
+				from_name:'', // 发货人名称	
+				from_tel:'',  // 发货人电话	
+				from_addr:"", // 发货人地址	
+				fictitious_content: '',
+				isTemp: false,
+				isDelivery: false,
+				is_virtual: 0,
+				splitProducts: [],
+				storeList: [],
+				activity_type: 0,
+				domain: HTTP_REQUEST_URL,
+				// #ifdef H5
+				isWeixin: this.$wechat.isWeixin()
+				// #endif
+			};
+		},
+		watch: {
+			"$route.params.oid": function(newVal) {
+				let that = this;
+				if (newVal != undefined) {
+					that.order_id = newVal;
+					that.getIndex();
+				}
+			}
+		},
+		computed: mapGetters(['viewColor']),
+		onLoad: function(option) {
+			this.order_id = option.id;
+			this.merId = option.merId
+			this.getIndex();
+			this.expressList();
+			this.orderDeliveryInfo();
+		},
+		methods: {
+			// 扫描快递单号一维码
+			scanCode() {
+				// #ifdef MP
+				let that = this;
+				uni.scanCode({
+					scanType: ['barCode'],
+					success(res) {
+						let code = res.result.split(",")
+						that.delivery_id = code.length == 1 ? code[0] : code[1];
+					}
+				})
+				// #endif
+				// #ifdef H5
+				if (this.$wechat.isWeixin()) {
+					this.$wechat.wechatEvevt('scanQRCode', {
+						needResult: 1,
+						scanType: ['barCode']
+					}).then(res => {
+						let code = res.resultStr.split(",")
+						that.delivery_id = code.length == 1 ? code[0] : code[1];
+					});
+				}
+				// #endif
+			},
+			// 预览图片
+			previewImage(){
+				uni.previewImage({
+					urls: [this.expTemp[this.expIndex].pic],
+					success:function(){},
+					fail:function(error){}
+				});
+			},
+			// 是否开启电子面单和同城配送
+			isOpenDeliveryTemp(is_virtual){
+				let that = this
+				getTempAndDelivery(that.merId).then(
+					res => {
+						if(is_virtual == 1){
+							that.delivery_type = 3
+							that.types = [
+								{type: 3,title: "虚拟发货"}
+							]
+						}else{
+							if(res.data.crmeb_serve_dump == 1){
+								that.types.push({type: 4,title: "电子面单"})
+							}
+							if(res.data.delivery_status == 1){
+								that.types.push({type: 5,title: "同城配送"})
+							}
+						}
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				);
+			},
+			//获取电子面单默认数据
+			getDump(){
+				let that = this;
+				that.expTemp.forEach((val,index) =>{
+					if(val.temp_id == that.mer_config_temp_id){
+						that.expIndex = index;
+						return;
+					}
+				})
+			},
+			 //获取门店列表
+			getStoreList() {
+			    getDeliveryStoreLst(this.merId).then((res) => {
+					this.storeList = res.data
+			    }).catch((error) => {
+			        this.$util.Tips({
+			        	title: error
+			        })
+			    })
+			},
+			changeType: function(item, index) {
+				this.active = index;
+				this.delivery_type = item.type;
+				this.delivery_name = "";
+				this.delivery_id = "";
+				if(item.type == 5){
+					this.getStoreList()
+				}
+			},
+			changeSplit: function(item, index) {
+				this.curSplit = item.key;
+			},
+			getIndex: function() {
+				let that = this;
+				getAdminOtherOrderDetail(that.merId,that.order_id).then(
+					res => {
+						res.data.orderProduct.forEach((goods, j) => {
+							goods.checked = true
+							goods.split_num = goods.refund_num
+						})
+						that.delivery = res.data;
+						that.activity_type = res.data.activity_type;
+						that.is_virtual = res.data.is_virtual;
+						that.isOpenDeliveryTemp(that.is_virtual);
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				);
+			},
+			expressList: function() {
+				let that = this;
+				expressList().then(
+					res => {
+						that.logistics = res.data;
+						that.getExpTemp(res.data[0].value)
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				);
+			},
+			/*选择分单商品*/
+			checkedChange(item) {
+				item.checked = !item.checked;
+			},
+			/*获取分单商品*/
+			getSplitProduct() {
+				let that = this;
+				let data = [];
+				that.delivery.orderProduct.map((item) => {
+					if(item.checked){
+						data.push({id:item.order_product_id,num:item.split_num})
+					}
+				})
+				return data;
+			},
+			subCart(item) {
+				if(item.split_num > 1){
+					item.split_num--
+				}
+			},
+			addCart(item) {
+				if(item.split_num < item.refund_num){
+					item.split_num++
+				}
+			},
+			async saveInfo() {
+				let that = this,
+				delivery_type = that.delivery_type,
+				delivery_name = that.logistics[that.seIndex].value,
+				delivery_id = that.delivery_id,
+				save = {};
+				save.delivery_name = delivery_name
+				save.delivery_type = delivery_type
+				save.is_split = that.curSplit
+				if(that.curSplit){
+					that.splitProducts = that.getSplitProduct()
+					if(that.splitProducts.length == 0){
+						return this.$util.Tips({
+							title: '请选择分单商品'
+						})
+					}
+				}
+				save.split = that.splitProducts;
+				if(delivery_type==1){
+					if (!delivery_id) {
+						return this.$util.Tips({
+							title: '请填写快递单号'
+						})
+					}
+					save.delivery_id = delivery_id
+					that.setInfo(save);
+				}
+				if(delivery_type == 2){
+					if (!that.to_name) {
+						return this.$util.Tips({
+							title: '请填写送货人姓名'
+						})
+					}
+					if (!that.to_phone) {
+						return this.$util.Tips({
+							title: '请填写送货人手机号码'
+						})
+					}
+					if (!(/^1[3456789]\d{9}$/.test(that.to_phone))) {
+						return this.$util.Tips({
+							title: '请填写正确的手机号码'
+						})
+					}
+					save.delivery_name = that.to_name;
+					save.delivery_id = that.to_phone;
+					that.setInfo(save);
+				}
+				if(delivery_type == 3){
+					save.remark = that.remark;
+					that.setInfo(save);
+				}
+				if(delivery_type==4){
+					if (!that.from_name) {
+						return this.$util.Tips({
+							title: '请填写寄件人姓名'
+						})
+					}
+					if (!that.from_tel) {
+						return this.$util.Tips({
+							title: '请填写寄件人手机号码'
+						})
+					}
+					if (!(/^1[3456789]\d{9}$/.test(that.from_tel))) {
+						return this.$util.Tips({
+							title: '请填写正确的手机号码'
+						})
+					}
+					if (!that.from_addr) {
+						return this.$util.Tips({
+							title: '请填写寄件人地址'
+						})
+					}
+					if(that.expTemp.length==0){
+						return this.$util.Tips({
+							title: '请选择电子面单'
+						})
+					}
+					save.from_name = that.from_name
+					save.from_tel = that.from_tel
+					save.from_addr = that.from_addr
+					save.temp_id = that.expTemp[that.expIndex].temp_id
+					that.setInfo(save);
+				}
+				if(delivery_type == 5){
+					save.station_id = that.storeList[that.storeIndex].value
+					save.cargo_weight = that.cargo_weight;
+					save.mark = that.mark;
+					that.setInfo(save);
+				}
+			},
+			setInfo: function(item) {
+				let that = this;
+				setAdminOtherOrderDelivery(that.merId,that.order_id,item).then(
+					res => {
+						that.$util.Tips({
+							title: res.message,
+							icon: 'success',
+							mask: true
+						})
+						setTimeout(res => {					
+							uni.redirectTo({
+								url:`/pages/admin/orderList/indexOther?types=3&merId=${that.merId}`
+							})
+						}, 1000)
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				);
+			},
+			bindPickerChange(e) {
+				this.seIndex = e.detail.value
+				this.getExpTemp(this.logistics[e.detail.value].value)
+			},
+			bindTempChange(e) {
+				this.expIndex = e.detail.value
+			},
+			bindStoreChange(e){
+				this.storeIndex = e.detail.value
+			},
+			getExpTemp(code){
+				orderExportTemp({
+					com: code
+				}).then(res=>{
+					this.expTemp = res.data.data
+				})
+			},
+			// 获取订单打印默认配置
+			orderDeliveryInfo(){
+				let that = this
+				orderDeliveryInfo(that.merId).then(
+					res => {
+						that.from_name = res.data.mer_from_name;
+						that.from_tel = res.data.mer_from_tel;
+						that.from_addr = res.data.mer_from_addr;
+						that.mer_config_temp_id = res.data.mer_config_temp_id;
+						that.mer_from_com = res.data.mer_from_com
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				)
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	/*发货*/
+	.uni-input{
+		display: block;
+		width: 400rpx;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
+	.input-inline{
+		width: auto;
+	}
+	.deliver-goods header {
+		width: 100%;
+		background-color: #fff;
+		margin-top: 10upx;
+	}
+	.deliver-goods header .order-num {
+		padding: 0 30upx;
+		border-bottom: 1px solid #f5f5f5;
+		height: 67upx;
+	}
+	.deliver-goods header .order-num .num {
+		width: 430upx;
+		font-size: 26upx;
+		color: #282828;
+		position: relative;
+	}
+	.deliver-goods header .order-num .num:after {
+		position: absolute;
+		content: '';
+		width: 1px;
+		height: 30upx;
+		background-color: #ddd;
+		top: 50%;
+		margin-top: -15upx;
+		right: 0;
+	}
+	.deliver-goods header .order-num .name {
+		width: 260upx;
+		font-size: 26upx;
+		color: #282828;
+		text-align: center;
+	}
+	.deliver-goods header .order-num .name .iconfont {
+		font-size: 35upx;
+		color: #477ef3;
+		vertical-align: middle;
+		margin-right: 10upx;
+	}
+	.deliver-goods header .address {
+		font-size: 26upx;
+		color: #868686;
+		background-color: #fff;
+		padding: 30upx;
+	}
+	.look{
+		margin-left: 20rpx;
+		color: #1890FF;
+	}
+	.deliver-goods header .address .name {
+		font-size: 34upx;
+		color: #282828;
+		margin-bottom: 10upx;
+	}
+	.deliver-goods header .address .name .phone {
+		margin-left: 40upx;
+	}
+	.deliver-goods header .line {
+		width: 100%;
+		height: 3upx;
+	}
+	.deliver-goods header .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+	.deliver-goods .wrapper {
+		width: 100%;
+		background-color: #fff;
+	}
+	.deliver-goods .wrapper .item {
+		border-bottom: 1px solid #f0f0f0;
+		padding: 0 30upx;
+		min-height: 96upx;
+		font-size: 28rpx;
+		color: #282828;
+		position: relative;
+	}
+	.deliver-goods .wrapper .item .mode {
+		width: 480upx;
+		height: 100%;
+		text-align: right;
+	}
+	.deliver-goods .wrapper .item .mode .iconfont {
+		font-size: 30upx;
+		margin-left: 13upx;
+	}
+	.deliver-goods .wrapper .item .mode .goods~.goods {
+		margin-left: 30upx;
+	}
+	.deliver-goods .wrapper .item .mode .goods {
+		color: #bbb;
+		margin: 10rpx 0;
+	}
+	.deliver-goods .wrapper .item .mode .goods.on {
+		color: #477ef3;
+	}
+	.deliver-goods .wrapper .item .icon-up {
+		position: absolute;
+		font-size: 35upx;
+		color: #2c2c2c;
+		right: 30upx;
+	}
+	.deliver-goods .wrapper .item select {
+		direction: rtl;
+		padding-right: 60upx;
+		position: relative;
+		z-index: 2;
+	}
+	.deliver-goods .wrapper .item input::placeholder {
+		color: #bbb;
+	}
+	.deliver-goods .confirm_btn {
+		position: fixed;
+		bottom: 0;
+		padding: 20rpx 30rpx;
+		background: #fff;
+		width: 100%;
+	}
+	.deliver-goods .confirm {
+		font-size: 32upx;
+		color: #fff;
+		width: 100%;
+		height: 90upx;
+		background-color: #477ef3;
+		text-align: center;
+		line-height: 90upx;
+		border-radius: 60rpx;
+	}
+	.select-box {
+		flex: 1;
+		height: 100%;
+		.pickerBox {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			width: 100%;
+			height: 100%;
+			text-align: right;
+			position: relative;
+			// padding-right: 30rpx;
+			.iconfont{
+				font-size: 28rpx;
+				color: #bbb;
+				position: absolute;
+				right: 0;
+				top: 10rpx;
+			}
+		}
+	}
+	.pro_list{
+		width: 100%;
+		padding: 20rpx 30rpx;
+		position: relative;
+		align-items: center;
+		border-bottom: 1px solid #f0f0f0;
+		justify-content: space-between;
+	}
+	.pro_list .checkbox{
+		width: 60rpx;
+		.icon-xuanzhong1{
+			color: var(--view-theme);
+		}
+	}
+	.pro_list .picture{
+		width: 180rpx;
+		height: 180rpx;
+	}
+	/deep/.pro_list .picture image{
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 6rpx;
+	}
+	.pro_count .title{
+		padding: 20rpx 30rpx;
+		line-height: 50rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.pro_list .info{
+		width: 420rpx;
+		font-size: 28rpx;
+		color: #282828;
+	}
+	.pro_list .pro_info{
+		width: 360rpx;
+	}
+	.pro_list .info_num{
+		color: #ff9600;
+		margin-top: 10rpx;
+	}
+	.pro_list .refund_num{
+		margin-top: 10rpx;
+		font-size: 24rpx;
+	}
+	.pro_list .pro_price{
+		text-align: right;
+	}
+	.pro_list .info .name{
+		line-height: 46rpx;
+	}
+	.pro_list .info .carnum{
+		height: 47rpx;
+		position: absolute;
+		bottom: 30rpx;
+		right: 30rpx;
+	}
+	.pro_list .info .carnum view{
+		border: 1px solid #a4a4a4;
+		min-width: 66rpx;
+		text-align: center;
+		height: 100%;
+		line-height: 46rpx;
+		font-size: 28rpx;
+		color: #a4a4a4;
+	}
+	.pro_list .info .carnum .reduce{
+		border-right: 0;
+		border-radius: 3rpx 0 0 3rpx;
+	}
+	.pro_list .info .carnum .reduce.on {
+		border-color: #e3e3e3;
+		color: #dedede;
+	}
+	.pro_list .info .carnum .plus {
+		border-left: 0;
+		border-radius: 0 3rpx 3rpx 0;
+	}
+	.pro_list .info .carnum .num {
+		color: #282828;
+	}
+	.pro_list .info .info_sku{
+		color: #868686;
+		font-size: 24rpx;
+		margin-top: 6rpx;
+	}
+	.pro_list .pro_info .info_sku{
+		margin-top: 20rpx;
+	}
+	.pro_list .info .info_price{
+		margin-top: 30rpx;
+	}
+	.footer{
+		padding: 20rpx 30rpx;
+		text-align: right;
+		line-height: 50rpx;
+		text{
+			color: #ff9600;
+		}
+	}
+</style>
diff --git a/pages/admin/orderDetail/indexOther.vue b/pages/admin/orderDetail/indexOther.vue
new file mode 100644
index 0000000..61edc9a
--- /dev/null
+++ b/pages/admin/orderDetail/indexOther.vue
@@ -0,0 +1,991 @@
+<template>
+	<view class="order-details pos-order-details">
+		<view class="header acea-row row-middle">
+			<view class="state">{{ title }}</view>
+			<view class="data">
+				<view class="order-num">订单：{{ orderInfo.order_sn }}</view>
+				<view>
+					<span class="time">{{ orderInfo.create_time }}</span>
+				</view>
+			</view>
+		</view>
+		<view class="remarks acea-row" v-if="goname != 'looks'" style="align-items: center;">
+			<span class="iconfont icon-zhinengkefu-"></span>
+			<view class="line1" style="text-align: left; flex: 1; margin-left: 10rpx;" @click="modify('1')">
+				 {{orderInfo.remark ? orderInfo.remark : '订单未备注，点击添加备注信息'}}
+			</view>
+		</view>
+		<view class="orderingUser acea-row row-middle">
+			<span class="iconfont icon-yonghu2"></span>{{ (orderInfo.user && orderInfo.user.nickname) || ''  }}
+		</view>
+		<view class="address">
+			<view class="name">
+				{{ orderInfo.real_name }}<span class="phone">{{ orderInfo.user_phone }}</span>
+			</view>
+			<view>{{ orderInfo.user_address }}</view>
+			<!-- #ifdef H5 -->
+			<button class="copy copy-data" :data-clipboard-text="'收货人姓名：'+orderInfo.real_name+'\n收货人电话：'+ orderInfo.user_phone+'\n收货人地址：'+orderInfo.user_address">复制</button>
+			<!-- #endif -->
+			<!-- #ifdef MP || APP-PLUS -->
+			<button class="copy" @tap="copyText">复制</button>
+			<!-- #endif -->
+		</view>
+		<view class="line">
+			<image :src="`${domain}/static/images/line.jpg`" />
+		</view>
+		<view class="pos-order-goods">
+			<navigator :url="`/pages/goods_details/index?id=${item.cart_info.product.product_id}`" hover-class="none" class="goods" v-for="(item, index) in orderInfo.orderProduct" :key="index">
+				<view class="acea-row row-between-wrapper">
+					<view class="picTxt acea-row row-between-wrapper">
+						<view class="pictrue">
+							<image :src="item.cart_info.productAttr.image || item.cart_info.product.image" />
+						</view>
+						<view class="text acea-row row-between row-column">
+							<view class="info line2">
+								{{ item.cart_info.product.store_name }}
+							</view>
+							<view class="attr">{{ item.cart_info.product.suk }}</view>
+						</view>
+					</view>
+					<view class="money">
+						<view class="x-money">￥{{ item.cart_info.productAttr.price }}</view>
+						<view class="num">x{{ item.product_num }}
+							<text class="font-color refund_num" v-if="item.product_num-item.refund_num>0">(-{{item.product_num-item.refund_num}})</text>
+						</view>
+						<view v-if="orderInfo.order_type == 0" class="y-money">￥{{ item.cart_info.productAttr.ot_price }}</view>	
+					</view>
+				</view>
+			</navigator>
+		</view>
+		<!-- <view class="public-total">
+			共{{ orderInfo.total_num }}件商品，应支付
+			<span class="money">￥{{ orderInfo.pay_price }}</span> ( 邮费 ¥{{orderInfo.pay_postage}})
+		</view> -->
+		<view class="wrapper">
+			<view class="item acea-row row-between">
+				<view>订单编号：</view>
+				<view class="conter acea-row row-middle row-right">
+					{{ orderInfo.order_sn }}
+					<!-- #ifdef H5 -->
+					<button class="copy copy-data" :data-clipboard-text="orderInfo.order_sn">复制</button>
+					<!-- #endif -->
+					<!-- #ifdef MP || APP-PLUS -->
+					<span class="copy copy-data" @click="copyNum(orderInfo.order_sn)">复制</span>
+					<!-- #endif -->
+				</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>下单时间：</view>
+				<view class="conter">{{ orderInfo.create_time }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>支付状态：</view>
+				<view class="conter">
+					{{ orderInfo.paid == 1 ? "已支付" : "未支付" }}
+				</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>支付方式：</view>
+				<view class="conter">{{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "先货后款" }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>买家留言：</view>
+				<view class="conter">{{ orderInfo.mark }}</view>
+			</view>
+		</view>
+		<view v-if="orderInfo.is_virtual == 1" class='wrapper'>
+			<view v-for="(item,index) in orderInfo.order_extend" v-if="item && index" :key="index" class='item acea-row row-between'>
+				<view>{{index}}：</view>
+				<view v-if="!Array.isArray(item)" class='conter'>{{item}}</view>
+				<view v-else class='conter virtual_image'>
+					<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic" @click="getPhotoClickIdx(item,i)"></image>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="wrapper">
+			<view class="item acea-row row-between">
+				<view>支付金额：</view>
+				<view class="conter">￥{{ orderInfo.total_price }}</view>
+			</view>
+			<view v-if="orderInfo.coupon_price > 0" class="item acea-row row-between">
+				<view>优惠券抵扣：</view>
+				<view class="conter">-￥{{ orderInfo.coupon_price }}</view>
+			</view>
+			<view v-if="orderInfo.integral_price > 0" class="item acea-row row-between">
+				<view>积分抵扣：</view>
+				<view class="conter">-￥{{ orderInfo.integral_price }}</view>
+			</view>
+			<view v-if="orderInfo.pay_postage > 0" class="item acea-row row-between">
+				<view>运费：</view>
+				<view class="conter">￥{{ orderInfo.pay_postage }}</view>
+			</view>
+			<view class="actualPay acea-row row-right">
+				实付款：<span class="money font-color-red">￥{{ orderInfo.pay_price }}</span>
+			</view>
+		</view> -->
+		<view class="wrapper" v-if="orderInfo.delivery_type != '3' && orderInfo.order_type === 0 && orderInfo.delivery_type">
+			<view class="item acea-row row-between">
+				<view>配送方式：</view>
+				<view class="conter" v-if="orderInfo.delivery_type === '1' || orderInfo.delivery_type === '4'">
+					快递
+				</view>
+				<view class="conter" v-if="orderInfo.delivery_type === '2'">送货</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view v-if="orderInfo.delivery_type === '1' || orderInfo.delivery_type === '4'">快递公司：</view>
+				<view v-if="orderInfo.delivery_type === '2'">送货人：</view>
+				<view class="conter line1">{{ orderInfo.delivery_name ? orderInfo.delivery_name : '' }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view v-if="orderInfo.delivery_type === '1' || orderInfo.delivery_type === '4'">快递单号：</view>
+				<view v-if="orderInfo.delivery_type === '2'">送货人电话：</view>
+				<view class="conter" style="display: flex;">
+					<text>{{ orderInfo.delivery_id ? orderInfo.delivery_id : ''}}</text>
+					<text class="copy copy-data" :data-clipboard-text="orderInfo.delivery_id">复制</text>
+				</view>
+			</view>
+		</view>
+		<view style="height:120upx;"></view>
+		<!-- <view class="footer acea-row row-right row-middle" v-if="goname != 'looks'" style="margin-bottom: var(--status-bar-height);">
+			<view class="more"></view>
+      <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(order_id,1)">
+      	同意
+      </view>
+      <view class="bnt cancel" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12"  @click="tongyi(order_id,2)">
+      	拒绝
+      </view>
+			<view class="bnt cancel" @click="modify('0')" v-if="orderInfo.paid == 0">
+				一键改价
+			</view>
+			<view class="bnt cancel" @click="modify('0')" v-if="types == -1">
+				立即退款
+			</view>
+			<view class="bnt cancel" @click="modify('1')">订单备注</view>
+			<view class="bnt cancel" v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0" @click="offlinePay">
+				确认付款
+			</view>
+			
+			<view class="bnt delivery" @click="toPostagequ(orderInfo)"  v-if="orderInfo.status == 0&&orderInfo.activity_type==0&& orderInfo.order_type !=1 ">
+				收件码
+			</view>
+			<navigator class="bnt delivery" v-if="orderInfo.paid == 1 && orderInfo.status == 0 && orderInfo.order_type == 0&&orderInfo.activity_type==98" :url="'/pages/admin/delivery/indexOther?id='+orderInfo.order_id+'&merId='+mer_id">去发货</navigator>
+			<view class="bnt delivery" v-if="orderInfo.paid == 1 && (orderInfo.status == 0 || orderInfo.status == 9) && orderInfo.order_type == 1" @click="goCancellation">去核销</view>
+		</view> -->
+		<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)" v-on:savePrice="savePrice"
+		 :status="status"></PriceChange>
+		 <u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
+		 	<view style="text-align: center;margin-top: 30rpx;">
+		 		请把二维码展示给取货人员
+		 	</view>
+		 	<view style="padding: 28.07rpx;">
+		 		<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
+		 
+		 	</view>
+		 </u-popup>
+	</view>
+</template>
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import PriceChange from "@/components/PriceChange";
+	// #ifdef H5
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	// #endif
+	import {
+		getAdminOrderDetail,
+    getAdminOtherOrderDetail,
+		setAdminOrderPrice,
+		setAdminOrderRemark,
+		setOfflinePay,
+		setOrderRefund,
+		orderCancellation,
+		logisticsCode,
+    postconfirm
+	} from "@/api/admin";
+	import { isMoney } from '@/utils/validate.js'
+	import { HTTP_REQUEST_URL } from '@/config/app';
+	export default {
+		name: "AdminOrder",
+		components: {
+			PriceChange
+		},
+		props: {},
+		data: function() {
+			return {
+				order: false,
+				change: false,
+				order_id: "",
+				mer_id: '',
+				orderInfo: {
+					_status: {},
+					user: {}
+				},
+				domain: HTTP_REQUEST_URL,
+				status: "",
+				title: "",
+				payType: "",
+				types: "",
+				clickNum: 1,
+				
+				goname:'',
+				popUpShow: false,
+				payCodeUrl:''
+			};
+		},
+		watch: {
+			"$route.params.oid": function(newVal) {
+				let that = this;
+				if (newVal != undefined) {
+					that.order_id = newVal;
+					that.getIndex();
+				}
+			}
+		},
+		onLoad: function(option) {
+			let self = this
+			self.order_id = option.id
+			self.mer_id = option.mer_id
+			self.goname = option.goname
+			self.getIndex();
+			// #ifdef H5
+			self.$nextTick(function() {
+				var clipboard = new ClipboardJS('.copy-data');
+				// var copybtn = document.getElementsByClassName("copy-data");
+				// var clipboard = new Clipboard(copybtn);
+				clipboard.on('success', function(e) {
+					self.$util.Tips({
+						title:'复制成功'
+					})
+				});
+				clipboard.on('error', function(e) {
+					self.$util.Tips({
+						title:'复制失败'
+					})
+				});
+			});
+			// #endif
+			
+		},
+		methods: {
+			
+			//收件码
+			toPostagequ(item){
+				this.popUpShow = true
+				logisticsCode(item.order_id).then(res => {
+				
+					if (res.status == 200) {
+						this.payCodeUrl = res.data.qrcode
+					}
+				})
+			},
+			// 关闭二维码弹窗
+			popUpClose() {
+				this.popUpShow = false
+			
+			},
+      //同意先货后款订单
+      tongyi(id,number){
+      	let data={
+      		id:id,
+      		type:number
+      	}
+        if(number == 1){
+          this.$nextTick(()=>{
+          uni.navigateTo({
+            url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}`
+          })
+          })
+        }else if(number == 2){
+         uni.navigateTo({
+           url:`/pages/admin/orderList/index?types=1&merId=${this.mer_id}`
+         })
+        }
+      	postconfirm(this.mer_id,data).then(res=>{
+      	})
+      },
+			more: function() {
+				this.order = !this.order;
+			},
+			modify: function(status) {
+				this.change = true;
+				this.status = status;
+			},
+			changeclose: function(msg) {
+				this.change = msg;
+			},
+			// 图片预览
+			getPhotoClickIdx(list, idx) {
+				uni.previewImage({
+					current: list[idx], //  传 Number H5端出现不兼容 
+					urls: list
+				});
+			},
+			copyText: function (e) {
+			    // var copy = e.currentTarget.dataset.copy;  //data-copy传过来的数值
+			    let arr = [
+			      {
+			        name: "收货人姓名",
+			        value: this.orderInfo.real_name
+			      },
+			      {
+			        name: "收货人电话",
+			        value: this.orderInfo.user_phone
+			      },
+			      {
+			        name: "收货人地址",
+			        value: this.orderInfo.user_address
+			      }
+			    ]
+			    // console.log(`${arr.map(item =>`${item.name}: ${item.value}`).join("\n")}`)
+			    wx.setClipboardData({
+			      data: `${arr.map(item =>`${item.name}: ${item.value}`).join("\n")}`,
+			      success: function (res) {
+			        wx.getClipboardData({
+			          success: function (res) {
+			            wx.showToast({
+			              title: '复制成功'
+			            })
+			          }
+			        })
+			      }
+			    })
+			},
+
+			getIndex: function() {
+				let that = this;
+				getAdminOtherOrderDetail(that.mer_id,that.order_id).then(
+					res => {
+						that.orderInfo = res.data;
+					},
+					err => {
+						that.$util.Tips({
+							title: err
+						}, {
+							tab: 3,
+							url: 1
+						});
+					}
+				);
+			},
+			/*核销订单*/
+			goCancellation() {
+				let that = this;
+				// uni.navigateTo({
+				// 	url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
+				// })
+				uni.navigateTo({
+					url: `/pages/admin/order_cancellation/index?mer_id=${that.mer_id}`
+				})
+				// uni.showModal({
+				// 	title: '订单核销',
+				// 	content: '请确认是否核销该订单？',
+				// 	success: function(res) {
+				// 		if (res.confirm) {
+				// 			orderCancellation(that.mer_id,that.orderInfo.order_id).then(res => {
+				// 				return that.$util.Tips({
+				// 					title: '操作成功',
+				// 					icon: 'success'
+				// 				}, function() {
+				// 					that.getIndex();
+				// 				});
+				// 			}).catch(err => {
+				// 				return that.$util.Tips({
+				// 					title: err
+				// 				});
+				// 			})
+				// 		}
+				// 	}
+				// })
+			},
+			async savePrice(opt) {
+				let that = this,
+					data = {},
+					price = opt.price,
+					refund_price = opt.refund_price,
+					refund_status = that.orderInfo.refund_status,
+					remark = opt.remark;
+				data.order_id = that.orderInfo.order_id;
+				if (that.status == 0) {
+					// if (!isMoney(price)) {
+					// 	return that.$util.Tips({
+					// 		title: '请输入正确的金额'
+					// 	});
+					// }
+					data.price = price;
+					let parmas = {
+						 pay_postage: opt.orderInfo.pay_postage,
+						 coupon_price: opt.orderInfo.coupon_price,
+						 total_price: Number(opt.orderInfo.total_price)
+					}
+					setAdminOrderPrice(that.mer_id,data.order_id, parmas ).then(
+						res => {
+							that.change = false;
+							that.$util.Tips({
+								title: '改价成功',
+								icon: 'success'
+							})
+							that.getIndex();
+						},
+						err => {
+							// console.log(err, 'err')
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				} else if (that.status == 0 && refund_status === 1) {
+					if (!isMoney(refund_price)) {
+						return that.$util.Tips({
+							title: '请输入正确的金额'
+						});
+					}
+					data.price = refund_price;
+					data.type = opt.type;
+					setOrderRefund(that.mer_id,data).then(
+						res => {
+							that.change = false;
+							that.$util.Tips({
+								title: res.message
+							});
+							that.getIndex();
+						},
+						err => {
+							// console.log(err, 'err')
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				} else {
+					if (!remark) {
+						return this.$util.Tips({
+							title: '请输入备注'
+						})
+					}
+					// data.remark = remark;
+					// console.log(data);
+					setAdminOrderRemark(that.mer_id,data.order_id,{ remark: remark }).then(
+						res => {
+							that.change = false;
+							this.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							})
+							that.getIndex();
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				}
+			},
+			offlinePay: function() {
+				setOfflinePay(this.mer_id,{
+					order_id: this.orderInfo.order_id
+				}).then(
+					res => {
+						this.$util.Tips({
+							title: res.msg,
+							icon: 'success'
+						});
+						this.getIndex();
+					},
+					err => {
+						this.$util.Tips({
+							title: err
+						});
+					}
+				);
+			},
+
+			copyNum(id) {
+				uni.setClipboardData({
+					data: id,
+					success: function() {
+						// console.log('success');
+					}
+				});
+			},
+			copyData(id){
+				uni.setClipboardData({
+					data: id,
+					success: function() {
+						// console.log('success');
+					}
+				});
+			},
+
+			// #ifdef H5
+			webCopy(item, index) {
+				// console.log('yunxingle')
+				let items = item
+				let indexs = index
+				let self = this
+
+				if (self.clickNum == 1) {
+					// console.log('22')
+					self.clickNum += 1
+					self.webCopy(items, indexs)
+				}
+			}
+			// #endif
+		}
+	};
+</script>
+
+<style lang="scss">
+	/*商户管理订单详情*/
+	.pos-order-details .header {
+		background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+	}
+
+	.pos-order-details .header .state {
+		font-size: 36upx;
+		color: #fff;
+	}
+
+	.pos-order-details .header .data {
+		margin-left: 35upx;
+		font-size: 28upx;
+	}
+
+	.pos-order-details .header .data .order-num {
+		font-size: 30upx;
+		margin-bottom: 8upx;
+	}
+
+	.pos-order-details .remarks {
+		width: 100%;
+		height: 86upx;
+		background-color: #fff;
+		padding: 0 30upx;
+	}
+
+	.pos-order-details .remarks .iconfont {
+		font-size: 40upx;
+		color: #2a7efb;
+	}
+
+	.pos-order-details .remarks input {
+		width: 630upx;
+		height: 100%;
+		font-size: 30upx;
+	}
+
+	.pos-order-details .remarks input::placeholder {
+		color: #666;
+	}
+
+	.pos-order-details .orderingUser {
+		font-size: 26upx;
+		color: #282828;
+		padding: 0 30upx;
+		height: 67upx;
+		background-color: #fff;
+		margin-top: 16upx;
+		border-bottom: 1px solid #f5f5f5;
+	}
+
+	.pos-order-details .orderingUser .iconfont {
+		font-size: 40upx;
+		color: #2a7efb;
+		margin-right: 15upx;
+	}
+
+	.pos-order-details .address {
+		margin-top: 0;
+	}
+
+	.pos-order-details .pos-order-goods {
+		margin-top: 17upx;
+	}
+
+	.pos-order-details .footer .more {
+		font-size: 27upx;
+		color: #aaa;
+		width: 100upx;
+		height: 64upx;
+		text-align: center;
+		line-height: 64upx;
+		margin-right: 25upx;
+		position: relative;
+	}
+
+	.pos-order-details .footer .delivery {
+		background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+	}
+
+	.pos-order-details .footer .more .order .arrow {
+		width: 0;
+		height: 0;
+		border-left: 11upx solid transparent;
+		border-right: 11upx solid transparent;
+		border-top: 20upx solid #e5e5e5;
+		position: absolute;
+		left: 15upx;
+		bottom: -18upx;
+	}
+
+	.pos-order-details .footer .more .order .arrow:before {
+		content: '';
+		width: 0;
+		height: 0;
+		border-left: 9upx solid transparent;
+		border-right: 9upx solid transparent;
+		border-top: 19upx solid #fff;
+		position: absolute;
+		left: -10upx;
+		bottom: 0;
+	}
+
+	.pos-order-details .footer .more .order {
+		width: 200upx;
+		background-color: #fff;
+		border: 1px solid #eee;
+		border-radius: 10upx;
+		position: absolute;
+		top: -200upx;
+		z-index: 9;
+	}
+
+	.pos-order-details .footer .more .order .item {
+		height: 77upx;
+		line-height: 77upx;
+	}
+
+	.pos-order-details .footer .more .order .item~.item {
+		border-top: 1px solid #f5f5f5;
+	}
+	
+	.pos-order-details .footer .more .moreName {
+		width: 100%;
+		height: 100%;
+	}
+
+	/*订单详情*/
+	.order-details .header {
+		padding: 0 30upx;
+		height: 150upx;
+	}
+
+	.order-details .header.on {
+		background-color: #666 !important;
+	}
+
+	.order-details .header .pictrue {
+		width: 110upx;
+		height: 110upx;
+	}
+
+	.order-details .header .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.order-details .header .data {
+		color: rgba(255, 255, 255, 0.8);
+		font-size: 24upx;
+		margin-left: 27upx;
+	}
+
+	.order-details .header.on .data {
+		margin-left: 0;
+	}
+
+	.order-details .header .data .state {
+		font-size: 30upx;
+		font-weight: bold;
+		color: #fff;
+		margin-bottom: 7upx;
+	}
+
+	/* .order-details .header .data .time{margin-left:20upx;} */
+	.order-details .nav {
+		background-color: #fff;
+		font-size: 26upx;
+		color: #282828;
+		padding: 25upx 0;
+	}
+
+	.order-details .nav .navCon {
+		padding: 0 40upx;
+	}
+
+	.order-details .nav .navCon .on {
+		font-weight: bold;
+		color: #e93323;
+	}
+
+	.order-details .nav .progress {
+		padding: 0 65upx;
+		margin-top: 10upx;
+	}
+
+	.order-details .nav .progress .line {
+		width: 100upx;
+		height: 2upx;
+		background-color: #939390;
+	}
+
+	.order-details .nav .progress .iconfont {
+		font-size: 25upx;
+		color: #939390;
+		margin-top: -2upx;
+		width: 30upx;
+		height: 30upx;
+		line-height: 33upx;
+		text-align: center;
+		margin-right: 0 !important;
+	}
+
+	.order-details .address {
+		font-size: 26upx;
+		color: #868686;
+		background-color: #fff;
+		padding: 25upx 30upx 30upx 30upx;
+		position: relative;
+	}
+
+	.order-details .address .name {
+		font-size: 30upx;
+		color: #282828;
+		margin-bottom: 0.1rem;
+	}
+
+	.order-details .address .name .phone {
+		margin-left: 40upx;
+	}
+
+	.order-details .line {
+		width: 100%;
+		height: 3upx;
+	}
+
+	.order-details .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-details .wrapper {
+		background-color: #fff;
+		margin-top: 12upx;
+		padding: 30upx;
+	}
+
+	.order-details .wrapper .item {
+		font-size: 28upx;
+		color: #282828;
+	}
+
+	.order-details .wrapper .item~.item {
+		margin-top: 20upx;
+	}
+
+	.order-details .wrapper .item .conter {
+		color: #868686;
+		text-align: right;
+		max-width: 450rpx;
+	}
+	.order-details .wrapper .item .virtual_image {
+		// text-align: left;
+		margin-left: 50rpx;
+	}
+	.order-details .wrapper .item .virtual_image .picture{
+		width: 106rpx;
+		height: 106rpx;
+		border-radius: 8rpx;
+		margin-right: 10rpx;
+		&:last-child{
+			margin-right: 0;
+		}
+	}
+	.order-details .wrapper .item .conter .copy {
+		font-size: 20rpx;
+		color: #868686;
+		border-radius: 3rpx;
+		border: 1px solid #868686;
+		padding: 0rpx 15rpx;
+		margin-left: 24rpx;
+		height: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 16rpx;
+	}
+	.address .copy{
+		font-size: 20rpx;
+		color: #868686;
+		border-radius: 3rpx;
+		border: 1px solid #868686;
+		padding: 0rpx 15rpx;
+		height: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 16rpx;
+		position: absolute;
+		right: 30rpx;
+		top: 20rpx;
+		
+	}
+	.order-details .wrapper .actualPay {
+		border-top: 1upx solid #eee;
+		margin-top: 30upx;
+		padding-top: 30upx;
+	}
+
+	.order-details .wrapper .actualPay .money {
+		font-weight: bold;
+		font-size: 30upx;
+	}
+
+	.order-details .footer {
+		width: 100%;
+		height: 100upx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		padding: 0 30upx;
+		border-top: 1px solid #eee;
+	}
+
+	.order-details .footer .bnt {
+		width: auto;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		line-height: upx;
+		border-radius: 50upx;
+		color: #fff;
+		font-size: 27upx;
+		padding: 0 3%;
+	}
+
+	.order-details .footer .bnt.cancel {
+		color: #aaa;
+		border: 1px solid #ddd;
+	}
+
+	.order-details .footer .bnt.default {
+		color: #444;
+		border: 1px solid #444;
+	}
+
+	.order-details .footer .bnt~.bnt {
+		margin-left: 18upx;
+	}
+
+	.pos-order-goods {
+		padding: 0 30upx;
+		background-color: #fff;
+		position: relative;
+	}
+
+	.pos-order-goods .goods {
+		padding: 20rpx 0;
+		overflow: hidden;
+	}
+
+	.pos-order-goods .goods~.goods {
+		border-top: 1px dashed #e5e5e5;
+	}
+
+	.pos-order-goods .goods .picTxt {
+		width: 515upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue {
+		width: 130upx;
+		height: 130upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text {
+		width: 365upx;
+		height: 130upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text .info {
+		font-size: 28upx;
+		color: #282828;
+	}
+
+	.pos-order-goods .goods .picTxt .text .attr {
+		font-size: 24upx;
+		color: #999;
+	}
+
+	.pos-order-goods .goods .money {
+		width: 164upx;
+		text-align: right;
+		font-size: 28upx;
+	}
+	.pos-order-goods .goods .money .refund_num{
+		display: inline-block;
+		margin-left: 10rpx;
+	}
+	.pos-order-goods .goods .money .x-money {
+		color: #282828;
+	}
+
+	.pos-order-goods .goods .money .num {
+		color: #ff9600;
+		margin: 5upx 0;
+	}
+
+	.pos-order-goods .goods .money .y-money {
+		color: #999;
+		text-decoration: line-through;
+	}
+	.pos-order-goods .cancellate{
+		font-size: 24rpx;
+		float: right;
+		margin-top: 10rpx;
+		text{
+			margin-left: 26rpx;
+		}
+	}
+	.pos-order-goods .cancelled{	
+		color: #FF9600;	
+	}
+	.pos-order-goods .goods .uncancell{
+		color: #999999;
+	}
+	.public-total {
+		font-size: 28upx;
+		color: #282828;
+		border-top: 1px solid #eee;
+		height: 92upx;
+		line-height: 92upx;
+		text-align: right;
+		padding: 0 30upx;
+		background-color: #fff;
+	}
+
+	.public-total .money {
+		color: #ff4c3c;
+	}
+</style>
diff --git a/pages/admin/orderList/indexOther.vue b/pages/admin/orderList/indexOther.vue
new file mode 100644
index 0000000..0919def
--- /dev/null
+++ b/pages/admin/orderList/indexOther.vue
@@ -0,0 +1,1007 @@
+<template>
+	<view class="pos-order-list" ref="container">
+		<view class="top-header">
+			<view class="search">
+				<view class="search-content acea-row row-middle">
+					<text class="iconfont icon-sousuo"></text>
+					<input v-model="where.search_info" confirm-type="search" placeholder="请输收货人手机号或订单号搜索" class="input"
+						@confirm="handleSearch" />
+				</view>
+			</view>
+			<view>
+				<scroll-view class="nav acea-row" scroll-x="true" style="white-space: nowrap; display: flex;"
+					scroll-with-animation show-scrollbar="true">
+					<!-- <view class="item" :class="where.status == 1 ? 'on' : ''" @click="changeStatus(1)">
+						待付款
+					</view>
+					<view class="item" :class="where.is_verify == 1 ? 'on' : ''" @click="changeStatus('verify')">
+						待核销
+					</view> -->
+					<view class="item" :class="where.status == 2 ? 'on' : ''" @click="changeStatus(2)">
+						待发货
+					</view>
+					<view class="item" :class="where.status == 3 ? 'on' : ''" @click="changeStatus(3)">
+						待收货
+					</view>
+					<!-- <view class="item" :class="where.status == 4 ? 'on' : ''" @click="changeStatus(4)">
+						待评价
+					</view> -->
+					<view class="item" :class="where.status == 5 ? 'on' : ''" @click="changeStatus(5)">
+						已完成
+					</view>
+				<!-- 	<view class="item" :class="where.status == 6 ? 'on' : ''" @click="changeStatus(6)">
+						退款
+					</view> -->
+				</scroll-view>
+
+			</view>
+		</view>
+		<view v-if="where.status == 6" class="list">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="order-num acea-row row-middle">
+					<text v-if="item.order && item.order.activity_type != 0" class="activity_type">
+						{{ item.order.activity_type == 1 ? '秒杀' : item.order.activity_type == 2 ? '预售' : item.order.activity_type == 3 ? '助力' : item.order.activity_type == 4 ? '拼团' : item.order.activity_type == 10 ? '套餐' :'' }}
+					</text>
+					退款单号：{{ item.refund_order_sn }}
+					<text class="time">申请时间：{{ item.create_time }}</text>
+				</view>
+				<view class="pos-order-goods" v-for="(val, key) in item.refundProduct" :key="key"
+					@click="toRefundDetail(item)">
+					<view v-if="val.product" class="goods acea-row row-between-wrapper">
+						<view class="picTxt acea-row row-between-wrapper">
+							<view class="pictrue">
+								<image :src="val.product.cart_info.productAttr.image||val.product.cart_info.product.image" />
+							</view>
+							<view class="text acea-row row-between row-column">
+								<view class="info line1 refund-info">
+									{{ val.product.cart_info.product.store_name }}
+								</view>
+								<view class="attr" v-if="val.product.cart_info.productAttr.sku">
+									{{ val.product.cart_info.productAttr.sku }}
+								</view>
+								<view class="y-money refund-y-money">
+									退款：￥{{ val.refund_price }}
+								</view>
+							</view>
+						</view>
+						<view class="money refund-money">
+							<view class="num">x{{ val.refund_num }}</view>
+						</view>
+					</view>
+				</view>
+				<view class="item-status">
+					<text v-if="item.status == -1" class="iconfont icon-yijujue1"></text>
+					<text v-if="item.status == 0" class="iconfont icon-tuikuanzhong on"></text>
+					<text v-if="item.status == 1 || item.status == 2" class="iconfont icon-tuihuozhong on"></text>
+					<text v-if="item.status == 3" class="iconfont icon-yituikuan1"></text>
+					<text v-if="item.status == -2" class="iconfont icon-yiquxiao"></text>
+				</view>
+				<view class="operation acea-row row-between-wrapper">
+					<view class="more">
+					</view>
+					<view class="acea-row row-middle">
+						<view class="bnt" @click="refundModify(item, 1)">订单备注</view>
+						<navigator class="bnt bnt_color" v-if="item.status == 0"
+							:url="'/pages/admin/orderRefund/index?id='+item.refund_order_id+'&merId='+merId">立即退款
+						</navigator>
+						<navigator class="bnt" v-if="item.status == 2"
+							:url="'/pages/users/goods_logistics/index?refundId='+item.refund_order_id+'&merId='+merId">
+							查看物流
+						</navigator>
+						<view class="bnt bnt_color" v-if="item.status == 2" @tap='confirmOrder(item)'>确认收货</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-else class="list">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="order-num acea-row row-middle">
+					<text v-if="item.activity_type != 0" class="activity_type">
+						{{ item.activity_type == 1 ? '秒杀' : item.activity_type == 2 ? '预售' : item.activity_type == 3 ? '助力' : item.activity_type == 4 ? '拼团' : item.activity_type == 10 ? '套餐' :'' }}
+					</text>
+					订单号：{{ item.order_sn }}
+					<text class="time">下单时间：{{ item.create_time }}</text>
+					<text class="order-status"
+						v-if="item.refunding != 0 && where.status != 1">{{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}}</text>
+				</view>
+				<view class="pos-order-goods" v-for="(val, key) in item.orderProduct" :key="key"
+					@click="toDetail(item)">
+					<view class="goods">
+						<view class="acea-row row-between-wrapper">
+							<view class="picTxt acea-row row-between-wrapper">
+								<view class="pictrue">
+									<image :src="val.cart_info.productAttr.image||val.cart_info.product.image" />
+								</view>
+								<view class="text acea-row row-between row-column">
+									<view class="info line2">
+										{{ val.cart_info.product.store_name }}
+									</view>
+									<view class="attr" v-if="val.cart_info.productAttr.sku">
+										{{ val.cart_info.productAttr.sku }}
+									</view>
+								</view>
+							</view>
+							<view class="money">
+								<view class="x-money">￥{{ val.cart_info.productAttr.price }}</view>
+								<view class="num">x{{ val.product_num }}</view>
+								<!-- <view class="refund-num" v-if="val.product_num-val.refund_num>0">{{val.product_num-val.refund_num}}件{{val.is_refund==1?'退款中' : val.is_refund==2 ? '已退款' : val.is_refund==3?'全部退款':''}}</view> -->
+							</view>
+						</view>
+						<!-- <view v-if="item.order_type == 1" class="cancellate">
+								<text class="uncancell">1件已核销</text>
+								<text class="uncancell">1件已退款</text>
+								<text class="cancelled">1件退款中</text>
+							</view> -->
+					</view>
+
+				</view>
+				<!-- <view class="public-total" v-if="item.pay_type !== 8">
+					共{{ item.total_num }}件商品，
+					<span v-if="where.status <= 1">应</span>
+					<span v-else>已</span>
+					支付
+					<span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费
+					¥{{ item.pay_postage}})
+				</view>
+				<view class="public-total" v-else>
+					先货后款
+					<span v-if="where.status <= 1">应</span>
+					<span v-else>已</span>
+					支付
+					<span class="money" style="margin-right: 30rpx;">￥0.00</span> (邮费 ¥{{ item.pay_postage}})
+				</view> -->
+				<view class="public-total" v-if="item.pay_type == 8 ">
+					共{{item.total_num}}件商品，结算周期到期后付款￥{{ item.pay_price }}
+				</view>
+				<view class="operation acea-row row-between-wrapper">
+					<view class="more">
+					</view>
+					<view class="acea-row row-middle">
+						<view class="bnt" v-if="item.pay_type == 8 && item.status == 12"
+							@click="tongyi(item.group_order_id,1)">
+							同意
+						</view>
+						<view class="bnt" v-if="item.pay_type == 8 && item.status == 12 "
+							@click="tongyi(item.group_order_id,2)">
+							拒绝
+						</view>
+						<view class="bnt" @click="modify(item, 0)"
+							v-if="item.pay_type !=8 && item.paid !=1 &&!(item.status ==2 && item.pau_type==8) ">
+							一键改价
+						</view>
+						<!-- <view class="bnt" @click="modify(item, 1)">订单备注</view> -->
+						<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&&(item.activity_type==98||item.activity_type==99)"
+							@click="toPostage(item)">去发货
+						</view>
+						<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0"
+							@click="toPostagequ(item)">收件码
+						</view>
+						<view class="bnt bnt_color"
+							v-if="(where.status == 2 && item.order_type == 1) || where.is_verify == 1"
+							@click="toDetail(item)">去核销</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<Loading :loaded="loaded" :loading="loading"></Loading>
+		<view v-if="!loading && list.length <= 0" class="nothing">
+			<image src="/static/images/no_thing.png" mode="widthFix"></image>
+			<view class="nothing_text">暂无订单~</view>
+		</view>
+		<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)"
+			v-on:savePrice="savePrice" :status="status"></PriceChange>
+		<view>
+			<view class="priceChange" :class="refundMark === true ? 'on' : ''">
+				<view class="priceTitle">
+					订单备注
+					<span class="iconfont icon-guanbi" @click="refundMark = false"></span>
+				</view>
+				<view class="listChange">
+					<textarea placeholder="请填写备注信息..." v-model="refundInfo.mer_mark"></textarea>
+				</view>
+				<view class="modify" @click="save">
+					确认提交
+				</view>
+			</view>
+			<view class="mask" @touchmove.prevent v-show="refundMark === true"></view>
+		</view>
+		<u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
+			<view style="text-align: center;margin-top: 30rpx;">
+				请把二维码展示给取货人员
+			</view>
+			<view style="padding: 28.07rpx;">
+				<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
+
+			</view>
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import {
+		getOrderList,
+    getOtherOrderList,
+		getRefundOrderList,
+		setAdminOrderPrice,
+		setAdminOrderRemark,
+		setOfflinePay,
+		setOrderRefund,
+		refundOrderReceive,
+		setRefundMark,
+		postconfirm,
+		logisticsCode
+	} from "@/api/admin";
+
+	import Loading from '@/components/Loading/index'
+	import PriceChange from '@/components/PriceChange/index'
+	import {
+		isMoney
+	} from '@/utils/validate.js'
+	export default {
+		name: "AdminOrderList",
+		components: {
+			Loading,
+			PriceChange
+		},
+		data() {
+			return {
+				current: "",
+				change: false,
+				refundMark: false,
+				types: 1,
+				where: {
+					page: 1,
+					limit: 10,
+					status: 1,
+					search_info: '',
+					product_type: '',
+          pay_time: null,
+				},
+				list: [],
+				loaded: false,
+				loading: false,
+				refundInfo: {},
+				orderInfo: {},
+				status: "",
+				codeShow: false,
+				merId: '',
+				popUpShow: false,
+				payCodeUrl: ''
+			};
+		},
+		watch: {
+			"$route.params.types": function(newVal) {
+				let that = this;
+				if (newVal != undefined) {
+					that.where.status = newVal;
+					that.init();
+				}
+			},
+			
+		},
+		onLoad(option) {
+			this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
+			this.where.status = option.types
+			this.current = "";
+			this.merId = option.merId;
+      if(option.pay_time){
+        this.where.pay_time = option.pay_time;
+      }
+		
+			this.getIndex();
+		},
+		methods: {
+			// 关闭二维码弹窗
+			popUpClose() {
+				this.popUpShow = false
+
+			},
+			//同意先货后款订单
+			tongyi(id, number) {
+				let data = {
+					id: id,
+					type: number
+				}
+				if (number == 1) {
+					this.$nextTick(() => {
+						this.where.status = 2;
+						delete this.where.is_verify;
+						this.init();
+					})
+				} else if (number == 2) {
+					uni.navigateTo({
+						url: `/pages/admin/orderList/index?types=1&merId=${this.merId}`
+					})
+				}
+				postconfirm(this.merId, data).then(res => {
+					// console.log(res);
+				})
+			},
+			handleSearch() {
+				this.loaded = false;
+			   this.where.page = 1;
+			   	this.list = [];
+				this.getIndex();
+			},
+			// 获取数据
+			getIndex() {
+			
+			
+				let that = this;
+				// console.log(that.merId)
+				if (that.loading || that.loaded) return;
+				that.loading = true;
+				if (that.where.status == 6) {
+					getRefundOrderList(that.where, that.merId).then(
+						res => {
+							that.loading = false;
+							that.loaded = res.data.list.length < that.where.limit;
+
+							that.list.push.apply(that.list, res.data.list);
+							that.where.page = that.where.page + 1;
+						},
+						err => {
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				} else {
+					getOtherOrderList(that.where, that.merId).then(
+						res => {
+							that.loading = false;
+							that.loaded = res.data.list.length < that.where.limit;
+							that.list.push.apply(that.list, res.data.list);
+							that.where.page = that.where.page + 1;
+							// console.log(that.list)
+
+							// console.log(that.list);
+						},
+						err => {
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				}
+			},
+			// 初始化
+			init: function() {
+				this.list = [];
+				this.where.page = 1;
+				this.loaded = false;
+				this.loading = false;
+				this.getIndex();
+				this.current = "";
+			},
+			// 导航切换
+			changeStatus(val) {
+				if (val != 'verify') {
+					if (this.where.status != val) {
+						this.where.status = val;
+						this.where.search_info=''
+						delete this.where.is_verify;
+						this.init();
+					}
+				} else {
+					this.where.search_info=''
+					this.where.is_verify = 1;
+					delete this.where.status;
+					this.init();
+				}
+			},
+			// 商品操作
+			modify: function(item, status) {
+				let temp = status.toString()
+				this.change = true;
+				this.orderInfo = item;
+				this.status = temp;
+			},
+			refundModify(item) {
+				this.refundInfo = item;
+				this.refundMark = true;
+			},
+			// 退款单备注
+			save(item) {
+				let that = this;
+				if (!that.refundInfo.mer_mark) {
+					return this.$util.Tips({
+						title: '请输入备注'
+					})
+				}
+				setRefundMark(that.merId, that.refundInfo.refund_order_id, {
+					mer_mark: that.refundInfo.mer_mark
+				}).then(
+					res => {
+						that.refundMark = false;
+						this.$util.Tips({
+							title: res.message,
+							icon: 'success'
+						})
+					},
+					err => {
+						that.refundMark = false;
+						that.$util.Tips({
+							title: err
+						});
+					}
+				);
+			},
+			changeclose: function(msg) {
+				this.change = msg;
+			},
+			// 确认收货
+			confirmOrder: function(item) {
+				let that = this;
+				uni.showModal({
+					title: '确认收货',
+					content: '为保障权益，请收到货确认无误后，再确认收货',
+					success: function(res) {
+						if (res.confirm) {
+							refundOrderReceive(that.merId, item.refund_order_id).then(res => {
+								return that.$util.Tips({
+									title: '操作成功',
+									icon: 'success'
+								}, function() {
+									item.status = 3;
+								});
+							}).catch(err => {
+								return that.$util.Tips({
+									title: err
+								});
+							})
+						}
+					}
+				})
+			},
+			//收件码
+			toPostagequ(item) {
+				this.popUpShow = true
+				logisticsCode(item.order_id).then(res => {
+
+					if (res.status == 200) {
+						this.payCodeUrl = res.data.qrcode
+					}
+				})
+			},
+			toPostage(item) {
+				let that = this;
+				if (item.refunding != 0) {
+					uni.showModal({
+						title: '标题',
+						content: '该订单有售后申请，请确认已处理！',
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: `/pages/admin/delivery/indexOther?id=${item.order_id}&merId=${that.merId}`
+								})
+
+							}
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pages/admin/delivery/indexOther?id=${item.order_id}&merId=${that.merId}`
+					})
+				}
+			},
+			async savePrice(opt) {
+				let that = this,
+					data = {},
+					price = opt.orderInfo.pay_postage,
+					refund_price = opt.refund_price,
+					refund_status = that.orderInfo.refund_status,
+					remark = opt.remark;
+				let parmas = {
+					pay_postage: opt.orderInfo.pay_postage,
+					coupon_price: opt.orderInfo.coupon_price,
+					total_price: Number(opt.orderInfo.total_price)
+				}
+				let id = that.orderInfo.order_id;
+				if (that.status == 0) {
+					if (!isMoney(opt.orderInfo.pay_postage || opt.orderInfo.total_price)) {
+						return that.$util.Tips({
+							title: '请输入正确的金额'
+						});
+					}
+					data.pay_price = price;
+					setAdminOrderPrice(this.merId, id, parmas).then(
+						function() {
+							that.change = false;
+							that.$util.Tips({
+								title: '改价成功',
+								icon: 'success'
+							})
+							that.init();
+						},
+						function(res) {
+							that.change = false;
+							that.$util.Tips({
+								title: res,
+								icon: 'none'
+							})
+						}
+					);
+				} else {
+					if (!remark) {
+						return this.$util.Tips({
+							title: '请输入备注'
+						})
+					}
+					setAdminOrderRemark(this.merId, id, {
+						remark: remark
+					}).then(
+						res => {
+							that.change = false;
+							this.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							})
+							that.init();
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				}
+			},
+			toDetail(item) {
+				uni.navigateTo({
+					url: `/pages/admin/orderDetail/indexOther?id=${item.order_id}&mer_id=${item.mer_id}`
+				})
+				
+			},
+			toRefundDetail(item) {
+				uni.navigateTo({
+					url: `/pages/admin/refundDetail/index?id=${item.refund_order_id}&mer_id=${item.mer_id}`
+				})
+			}
+		},
+		onReachBottom() {
+			this.getIndex()
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pos-order-list .top-header {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999;
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.pos-order-list .nav {
+		// width: 100%;
+		height: 96upx;
+		font-size: 30upx;
+		color: #282828;
+		width: 690rpx;
+		margin: 0 auto;
+	}
+
+	.pos-order-list .nav .item {
+		display: inline-block;
+		text-align: center;
+		color: #333333;
+		max-width: 160rpx;
+		margin-right: 50rpx;
+		line-height: 96upx;
+
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+
+	.pos-order-list .nav .item.on {
+		color: #2291f8;
+	}
+
+	.pos-order-list .list {
+		margin-top: 210upx;
+	}
+
+	.pos-order-list .list .item {
+		background-color: #fff;
+		width: 100%;
+		position: relative;
+	}
+
+	.pos-order-list .list .item .item-status {
+		position: absolute;
+		top: 14rpx;
+		right: 20rpx;
+
+		.iconfont {
+			font-size: 98rpx;
+			color: #CCCCCC;
+
+			&.on {
+				color: #FFE3BC;
+			}
+		}
+	}
+
+	.pos-order-list .list .item~.item {
+		margin-top: 24upx;
+	}
+
+	.pos-order-list .list .activity_type {
+		display: inline-block;
+		color: #E93323;
+		font-size: 20rpx;
+		text-align: center;
+		border-radius: 5rpx;
+		padding: 0 4rpx;
+		line-height: 28rpx;
+		margin-right: 8rpx;
+		border: 1rpx solid #E93323;
+	}
+
+	.pos-order-list .list .item .order-num {
+		height: 124upx;
+		border-bottom: 1px solid #eee;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #282828;
+		padding: 0 30upx;
+		position: relative;
+	}
+
+	.pos-order-list .list .item .order-status {
+		color: #ff9600;
+		position: absolute;
+		top: 24rpx;
+		right: 20rpx;
+		text-align: right;
+		width: 160rpx;
+		font-weight: normal;
+		font-size: 26rpx;
+	}
+
+	.pos-order-list .list .item .order-num .time {
+		font-size: 26upx;
+		font-weight: normal;
+		color: #999;
+		margin-top: -40upx;
+	}
+
+	.pos-order-list .list .item .operation {
+		padding: 20upx 30upx 20upx 0;
+		margin: 30upx 0 0 30upx;
+		border-top: 1rpx solid #EEEEEE;
+	}
+
+	.pos-order-list .list .item .operation .more {
+		position: relative;
+	}
+
+	.pos-order-list .list .item .operation .icon-gengduo {
+		font-size: 50upx;
+		color: #aaa;
+	}
+
+	.pos-order-list .list .item .operation .order .arrow {
+		width: 0;
+		height: 0;
+		border-left: 11upx solid transparent;
+		border-right: 11upx solid transparent;
+		border-top: 20upx solid #e5e5e5;
+		position: absolute;
+		left: 15upx;
+		bottom: -18upx;
+	}
+
+	.pos-order-list .list .item .operation .order .arrow:before {
+		content: '';
+		width: 0;
+		height: 0;
+		border-left: 7upx solid transparent;
+		border-right: 7upx solid transparent;
+		border-top: 20upx solid #fff;
+		position: absolute;
+		left: -7upx;
+		bottom: 0;
+	}
+
+	.pos-order-list .list .item .operation .order {
+		width: 200upx;
+		background-color: #fff;
+		border: 1px solid #eee;
+		border-radius: 10upx;
+		position: absolute;
+		top: -100upx;
+		z-index: 9;
+	}
+
+	.pos-order-list .list .item .operation .order .items {
+		height: 77upx;
+		line-height: 77upx;
+		text-align: center;
+	}
+
+	.pos-order-list .list .item .operation .order .items~.items {
+		border-top: 1px solid #f5f5f5;
+	}
+
+	.pos-order-list .list .item .operation .bnt {
+		font-size: 28upx;
+		color: #5c5c5c;
+		width: 160upx;
+		height: 60upx;
+		border-radius: 30upx;
+		border: 1px solid #bbb;
+		text-align: center;
+		line-height: 60upx;
+	}
+
+	.pos-order-list .list .item .operation .bnt_color {
+		border: none;
+		color: #fff;
+		background: linear-gradient(90deg, #2291F8 0%, #1CD1DC 100%);
+	}
+
+	.pos-order-list .list .item .operation .bnt~.bnt {
+		margin-left: 14upx;
+	}
+
+	.pos-order-goods {
+		padding: 0 30upx;
+		background-color: #fff;
+	}
+
+	.pos-order-goods .goods {
+		padding-top: 20rpx;
+		overflow: hidden;
+	}
+
+	.pos-order-goods .goods~.goods {
+		border-top: 1px dashed #e5e5e5;
+	}
+
+	.pos-order-goods .cancellate {
+		font-size: 24rpx;
+		float: right;
+		margin-top: 10rpx;
+
+		text {
+			margin-left: 26rpx;
+		}
+	}
+
+	.pos-order-goods .cancelled {
+		color: #FF9600;
+	}
+
+	.pos-order-goods .goods .uncancell {
+		color: #999999;
+	}
+
+	.pos-order-goods .goods .picTxt {
+		width: 515upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue {
+		width: 130upx;
+		height: 130upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text {
+		flex-direction: column;
+		width: 365upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text .info {
+		font-size: 28upx;
+		color: #282828;
+
+		&.refund-info {
+			width: 460upx;
+		}
+	}
+
+	.refund-y-money {
+		margin-top: 16rpx;
+		font-size: 26rpx;
+	}
+
+	.pos-order-goods .goods .picTxt .text .attr {
+		margin-top: 5rpx;
+		font-size: 24upx;
+		color: #999;
+	}
+
+	.pos-order-goods .goods .money {
+		width: 164upx;
+		text-align: right;
+		font-size: 28upx;
+
+		&.refund-money {
+			width: auto;
+			position: relative;
+			top: -50rpx;
+
+			.num {
+				color: #999999;
+			}
+
+		}
+
+		.refund-num {
+			font-size: 24rpx;
+			color: #282828;
+		}
+	}
+
+	.pos-order-goods .goods .money .x-money {
+		color: #282828;
+	}
+
+	.pos-order-goods .goods .money .num {
+		color: #ff9600;
+		margin: 5upx 0;
+	}
+
+	.pos-order-goods .goods .money .y-money {
+		color: #999;
+		text-decoration: line-through;
+	}
+
+	.pos-order-goods .goods .refund_num {
+		display: inline-block;
+		margin-left: 10rpx;
+	}
+
+	.public-total {
+		font-size: 28upx;
+		color: #282828;
+		height: 92upx;
+		line-height: 92upx;
+		text-align: right;
+		padding: 0 30upx;
+		background-color: #fff;
+	}
+
+	.public-total .money {
+		color: #ff4c3c;
+	}
+
+	.nothing {
+		margin-top: 200rpx;
+		text-align: center;
+	}
+
+	.nothing_text {
+		margin-top: 20rpx;
+		color: #999999;
+	}
+
+	.priceChange {
+		position: fixed;
+		width: 580upx;
+		background-color: #fff;
+		border-radius: 10upx;
+		top: 50%;
+		left: 50%;
+		margin-left: -290upx;
+		margin-top: -335upx;
+		z-index: 666;
+		transition: all 0.3s ease-in-out 0s;
+		transform: scale(0);
+		opacity: 0;
+	}
+
+	.priceChange.on {
+		opacity: 1;
+		transform: scale(1);
+	}
+
+	.priceChange .priceTitle {
+		background: url("~@/static/images/pricetitle.jpg") no-repeat;
+		background-size: 100% 100%;
+		width: 100%;
+		height: 160upx;
+		border-radius: 10upx 10upx 0 0;
+		text-align: center;
+		font-size: 40upx;
+		color: #fff;
+		line-height: 160upx;
+		position: relative;
+	}
+
+	.priceChange .priceTitle .iconfont {
+		position: absolute;
+		font-size: 40upx;
+		right: 26upx;
+		top: 23upx;
+		width: 40upx;
+		height: 40upx;
+		line-height: 40upx;
+	}
+
+	.priceChange .listChange {
+		padding: 0 40upx;
+	}
+
+	.priceChange .listChange textarea {
+		box-sizing: border-box;
+	}
+
+	.priceChange .listChange .item {
+		height: 103upx;
+		border-bottom: 1px solid #e3e3e3;
+		font-size: 32upx;
+		color: #333;
+	}
+
+	.priceChange .modify {
+		font-size: 32upx;
+		color: #fff;
+		width: 490upx;
+		height: 90upx;
+		text-align: center;
+		line-height: 90upx;
+		border-radius: 45upx;
+		background-color: #2291f8;
+		margin: 53upx auto;
+	}
+
+	.priceChange .listChange textarea {
+		border: 1px solid #eee;
+		width: 100%;
+		height: 200upx;
+		margin-top: 50upx;
+		border-radius: 10upx;
+		color: #333;
+		padding: 20upx;
+	}
+
+	.search {
+		padding: 17rpx 30rpx;
+
+		.search-content {
+			width: 100%;
+			height: 60rpx;
+			padding: 0 30rpx;
+			border-radius: 30rpx;
+			background-color: #F5F5F5;
+			font-size: 26rpx;
+		}
+
+		.iconfont {
+			margin-right: 10rpx;
+			font-size: 26rpx;
+			color: #999999;
+		}
+
+		.input-placeholder {
+			font-size: 26rpx;
+			color: #999999;
+		}
+
+		.input {
+			flex: 1;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cee121a..e5963e1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -69,6 +69,25 @@
 
         </view>
       </view>
+      <view class="content-tools" style="margin-top: 10rpx;" v-if="$store.state.app.userInfo&&$store.state.app.userInfo.mer_info&&$store.state.app.userInfo.mer_info.type_code=='TypeSupplyChain'">
+        <view class="tools-one">
+          赊账订单
+          <view class=""></view>
+        </view>
+        <view class="content-order" >
+          <view class="" v-for="(item,i) in other_order" :key='i' @click="other_shopporder(item)">
+            <view class="content-order-two">
+              {{item.value}}
+            </view>
+            <view class="content-order-one">
+              {{item.name}}
+            </view>
+          </view>
+          <view class="" v-for="item in 3" :key="'empty'+item">
+            
+          </view>
+        </view>
+      </view>
 
       <view class="content-tools">
         <view class="tools-one">
@@ -373,6 +392,7 @@
   import image from '../../uni_modules/uview-ui/libs/config/props/image';
   import {
     orderStatistics,
+    otherOrderStatistics,
     getOrderList
 
   } from "@/api/admin";
@@ -423,7 +443,15 @@ import { Toast } from '../../libs/uniApi';
           type: 6,
           value: 0
         }],
-
+        other_order: [{
+          name: '待发货',
+          type: 2,
+          value: 0
+        }, {
+          name: '待收货',
+          type: 3,
+          value: 0
+        }],
         typelist: [{
             name: '商品管理',
             type: 1,
@@ -667,8 +695,49 @@ import { Toast } from '../../libs/uniApi';
               break;
 
           }
-
-
+        } else {
+          this.isAuto = true;
+          this.isShowAuth = true
+        }
+      },
+      other_shopporder(item) {
+        if (this.userid) {
+          switch (item.type) {
+            case 1:
+              uni.navigateTo({
+                url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
+                  '&types=' + item.type
+              })
+              break;
+            case 2:
+      
+              uni.navigateTo({
+                url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
+                  '&types=' + item.type
+              })
+              break;
+            case 3:
+              uni.navigateTo({
+                url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
+                  '&types=' + item.type
+              })
+              break;
+            case 4:
+              uni.navigateTo({
+                url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
+                  '&types=' + item.type
+      
+              })
+              break;
+            case 6:
+              uni.navigateTo({
+                url: '/pages/admin/orderList/indexOther?merId=' + this.userInfoData.service.mer_id +
+                  '&types=' + item.type
+      
+              })
+              break;
+      
+          }
         } else {
           this.isAuto = true;
           this.isShowAuth = true
@@ -938,6 +1007,17 @@ import { Toast } from '../../libs/uniApi';
             })
           }
         );
+        otherOrderStatistics(this.userInfoData.service.mer_id, data).then(
+          res => {
+            this.other_order[0].value = res.data.order.unshipped
+            this.other_order[1].value = res.data.order.untake
+          },
+          err => {
+            that.$util.Tips({
+              title: err.msg
+            })
+          }
+        );
       },
       open() {
         this.isshow = !this.isshow
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 91019a1..6fef310 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -155,6 +155,10 @@
                   <image class="icon_img" src="@/static/images/index5.png" mode="aspectFit"></image>
                   <text class="text">进货管理</text>
                 </view>
+                <view class="examine" @click="navigator('/pages/users/order_list/indexOther?status=-1&product_type=98&source=12')">
+                  <image class="icon_img" src="@/static/images/index13.png" mode="aspectFit"></image>
+                  <text class="text">赊账订单</text>
+                </view>
                 <view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
                   <image class="icon_img" src="@/static/images/index10.png" mode="aspectFit">
                   </image>
diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue
new file mode 100644
index 0000000..3f319dd
--- /dev/null
+++ b/pages/nongKe/cloud_entrepot/indexOther.vue
@@ -0,0 +1,1931 @@
+<template>
+  <view style="background-color: #f5f5f5;">
+    
+    <view class='productList' :style="viewColor">
+      <!-- 顶部 -->
+      <view class="top">
+        <view class="head_tit">
+          <view class="" style="display: flex;align-items: center;width: 100%;justify-content: space-between;">
+            <!-- 	<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
+							height="50.82rpx" @click='backjJump'></u--image> -->
+            <view style="display: flex;align-items: center;">
+              <i class="iconfont icon-xiangzuo" style="font-size: 31.54rpx;text-align: left;" @click='backjJump'></i>
+              <view class=""
+                style="font-size: 31.54rpx;font-weight: 700;margin-left: 20rpx;color: #F84221;">
+                供货采购商品
+              </view>
+              <!-- <view class=""
+                @click="navGoto(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${userInfoData.mer_info.category_id}`)"
+                style="font-size: 31.54rpx;font-weight: 700;margin-left: 22rpx;">
+                供货采购市场
+              </view> -->
+            </view>
+          </view>
+        </view>
+
+        <view class="sswz">
+          <view style="position: relative;width: 694rpx;margin: 0 auto;">
+            <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺或者名称"
+              v-model="storeParam.keyword" @search="onInputConfirm" class="serch_cls"></u-search>
+            <u--image @tap="searchSubmit" class="img_cls" :showLoading="true" src="/static/images/GXSC/SSBT.png"
+              width="115.65rpx" height="56.82rpx"></u--image>
+          </view>
+        </view>
+
+        <view class="flags">
+
+        </view>
+      </view>
+
+
+      <view class="content">
+        <view class="" :style="`height:${headTop}px`">
+
+        </view>
+        <view class="hot_serch">
+          <!-- <text>热搜:</text> -->
+        </view>
+
+        <view class="menu_cls">
+          <u-scroll-list indicatorActiveColor='#FF6D20' :indicator="true">
+            <view class="menu_li" :class="{'menu_li_on': item.cate_name==merchant.cate_name}"
+              @click="changeMerchant(item)" v-for="item,index in cloudList" :key="index">
+              <u--image class="image" :showLoading="true" :src="item.pic" width="87.62rpx" height="87.62rpx"
+                shape="circle"></u--image>
+              <view class="li_text" style="display: block;font-size: 26.29rpx;margin-top: 10rpx;">{{item.cate_name}}
+              </view>
+            </view>
+          </u-scroll-list>
+          <view class="all" @click="showAllRef">
+            <view>全</view>
+            <view>部</view>
+            <image src="@/static/images/icon/all.png"></image>
+          </view>
+        </view>
+
+      </view>
+
+      <view class="container">
+        <scroll-view scroll-y class="left-panel" @scrolltolower="loadMoreLeft">
+          <!-- 左侧内容 -->
+          <view class="left-panel_item" v-for="(item, index) in merchant.children" :class="{'left-panel_item_active': item.cate_name==merchantTow.cate_name}" @click="changeMerchantTow(item)">{{item.cate_name}}</view>
+          <view style="height: 200rpx;"></view>
+        </scroll-view>
+        <view class="right-panel">
+          <view class="right-panel-head">
+            <view :class="{'active': storeParam.order==''}" @click="set_where('')">综合</view>
+            <view>
+              <view :class="{'active': storeParam.order=='sales'}" @click="set_where('sales')">销量</view>
+              <!-- <view :class="{'active': storeParam.order.includes('price')}" @click="set_where(price_order)">
+                <text style="margin-right: 5rpx;">价格</text>
+                <image class="icon" v-if="price_order=='procure_price_asc'&&storeParam.order.includes('price')" :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
+                <image class="icon" v-else-if="price_order=='procure_price_desc'&&storeParam.order.includes('price')" :src="domain+'/static/diy/down'+keyColor+'.png'"></image>
+                <image class="icon" v-else src='/static/images/horn.png'></image>
+              </view> -->
+            </view>
+          </view>
+          <scroll-view scroll-y class="right-panel-view" @scrolltolower="loadMoreRight">
+            <!-- 右侧内容 -->
+            <view class='no-shop' v-if="goodsList.length==0 && !showLoading" v-cloak>
+              <view class='pictrue' style="margin: 0 auto;">
+                <!-- <image src='../../../static/images/noCart.png'></image> -->
+                <image src='@/static/images/no_short.png'></image>
+                <text>暂无商品，切换其他分类或地区试试</text>
+              </view>
+            </view>
+            <block>
+              <view v-if="item.product" v-for="(item, index) in goodsList" class="short_item" @click="clickProduct(item)">
+                <image class="image" :src="item.product.image"></image>
+                <view class="short_item_right">
+                  <view class="r_name">{{item.product.store_name}}</view>
+                  <view class="r_type">
+                    <view v-if="item.product.store_info">{{item.product.store_info}}</view>
+                    <view v-else-if="getSkuName(item)">{{getSkuName(item)}}</view>
+                    <view v-else-if="item.unit_name">{{item.unit_name}}</view>
+                  </view>
+                  <view class="r_btn" v-if="getAttr(item)">
+                    <view>￥<text style="font-size: 33rpx;">{{ getAttr(item).procure_price.split('.')[0] }}.</text>{{getAttr(item).procure_price.split('.')[1]}}</view>
+                    <image src="@/static/images/icon/plus.png" style="width: 40rpx;height: 40rpx;border-radius: 40rpx;"></image>
+                  </view>
+                </view>
+              </view>
+            </block>
+            <u-loadmore v-if="showLoading" status="loading"></u-loadmore>
+            <view style="height: 200rpx;"></view>
+          </scroll-view>
+        </view>
+      </view>
+
+    </view>
+    <!-- <u-loadmore v-if="storeParam.is_recommend==false && storeList.length != 0 || (storeParam.is_recommend==true)"
+      :status="status" /> -->
+      
+    <!-- 购物车 -->
+    <view class="card" :style="`bottom:${30}px`"
+      @click="navgo(`/pages/nongKe/supply_chain/shopping_trolley_other?source=${storeParam.sys_labels}`)">
+      <view class="left">
+        <view class="cart" style="position: relative;z-index: 9999999;">
+          <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
+            height="63.09rpx"></u--image>
+    
+         <view class="badge" v-show="goodsNum">
+            {{goodsNum}}
+          </view>
+        </view>
+        <view class="tot_price">
+          <view class="">
+            ￥{{totalMoney}}
+          </view>
+          <view class="">
+            {{tips||'支持配送 售后无忧'}}
+          </view>
+        </view>
+      </view>
+      <view class="right">
+        去结算
+      </view>
+    </view>
+    
+    <uni-popup ref="allRef" type="right" @change="changeAllRef">
+      <view class="all_ref">
+        <view class="header">请选择商品分类</view>
+        <view class="all_list">
+          <view class="menu_li" :class="{'menu_li_on': item.cate_name==merchant.cate_name}"
+            @click="changeMerchant(item, true)" v-for="item,index in cloudList" :key="index">
+            <u--image class="image" :showLoading="true" :src="item.pic" width="87.62rpx" height="87.62rpx"
+              shape="circle"></u--image>
+            <view class="li_text" style="display: block;font-size: 26.29rpx;margin-top: 10rpx;">{{item.cate_name}}
+            </view>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
+    
+    <shortPopup ref="shortPopupRef" @addCart="loadCart" :source="storeParam.sys_labels"></shortPopup>
+
+  </view>
+</template>
+
+<script>
+  import {
+    getStoreList,
+    getGeocoder,
+  } from '@/api/store.js';
+  import {
+    supMenuApi
+  } from '@/api/requesta.js';
+  import recommend from '../supply_chain/component/recommend';
+  import rightSlider from '../supply_chain/component/rightSlider';
+  import {
+    merClassifly,
+    getStoreTypeApi,
+    getProductslist,
+  } from '@/api/store.js';
+  import {
+    mapGetters
+  } from "vuex";
+  import {
+    goShopDetail
+  } from '@/libs/order.js'
+  import {
+    configMap
+  } from '@/utils';
+  import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+  import {
+    getArea,
+    getStreet
+  } from '@/api/article.js';
+  import {
+    getIndexData,
+    getDiy
+  } from '@/api/api.js'
+
+  import {
+    HTTP_REQUEST_URL
+  } from '@/config/app';
+  import {
+    townCloud,
+    getCityCloundShop,
+    getCategoryListLevel
+  } from '@/api/requesta.js'
+  import {
+    getCartCounts,
+    getCartList,
+  } from '@/api/requesta.js';
+
+  import Cache from '@/utils/cache';
+  import shortPopup from "@/components/shortPopup.vue"
+  import { Toast } from '../../../libs/uniApi';
+  const app = getApp();
+  export default {
+    components: {
+      recommend,
+      rightSlider,
+      easyLoadimage,
+      shortPopup
+    },
+    data() {
+      return {
+        domain: HTTP_REQUEST_URL,
+        defaInd: [0, 0],
+        columnData: [],
+        showSerch: false,
+        headTop: 0,
+        street_id: "",
+        showSelect: false,
+        price: 0,
+        stock: 0,
+        nows: false,
+        loading: false,
+        loadingIcon: true,
+        loadTitle: '加载更多',
+        title: '',
+        hotPage: 1,
+        hotLimit: 10,
+        hotScroll: false,
+        // 筛选框
+        rightBox: false,
+        //品牌列表
+        brandList: [],
+        downKey: 0,
+        downStatus: false,
+        cloudList: [],
+        street: "",
+        showPicker: false,
+        status: "loadmore",
+        price_order: 'procure_price_asc', //价格排序方式(升降), procure_price_asc, procure_price_desc
+        // 下拉菜单
+        downMenu: [{
+            title: '默认',
+            key: 0,
+            order: ""
+          },
+          {
+            title: '销量',
+            key: 1,
+            order: 'sales'
+          },
+          {
+            title: '好评',
+            key: 2,
+            order: 'rate'
+          },
+          {
+            title: '距离',
+            key: 3,
+            order: 'location'
+          }
+        ],
+        // 商铺列表
+        storeList: [],
+        storeParam: {
+          keyword: '',
+          page: 1,
+          limit: 10,
+          order: '',
+          category_id: '',
+          type_id: '',
+          street_id: '',
+          sys_labels: '',
+          is_recommend: false, // 是否为推荐的参数
+        },
+        storeKey: 0,
+        storeScroll: true,
+        merchant: '', // 当前选中一级分类
+        merchantTow: '', //当前选中二级分类
+        mer_id: '',
+        sortId: '',
+        price_on: '',
+        price_off: '',
+        detaile_address: "",
+        recommend_address: "",
+        location_address: "",
+        latitude: "",
+        longitude: "",
+        count: 0,
+        storeTypeArr: [], //店铺类型
+        merList: [], //商户分类
+        product_type: 0,
+        show: false,
+        image: '', //图片,
+        credit_buy: '', //支持先货后款
+        cloudList: [], // 类型列表
+        trnList: [],
+        goodsNum: 0,
+        totalMoney: 0,
+        goodsList: [], //商品列表
+        showLoading: false, //是否显示加载
+        allShow: false, //是否显示全部类型弹窗
+        userInfoData: {
+          mer_info: {
+            type_id: 0
+          }
+        },
+        tips: '', //底部提示
+      };
+    },
+    async onLoad(options) {
+      // console.log(options);
+      this.storeParam.sys_labels = options.value;
+      this.tips = options.tips;
+      let userInfo = this.$store.state.app.userInfo;
+      if(typeof userInfo == 'string') this.userInfoData = JSON.parse(userInfo);
+      else this.userInfoData = userInfo;
+      
+      this.product_type = 98
+      this.credit_buy = options.credit_buy
+      this.storeParam.type_id = options.type_id
+      this.storeParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
+      this.storeList = [];
+      this.showLoading = true;
+      
+      await this.getCloundShop();
+      let that = this
+      setTimeout(() => {
+        uni.createSelectorQuery()
+          .in(this)
+          .select('.flags')
+          .boundingClientRect(rect => {
+            // console.log(this.cartTagInfo, 6666)
+            // that.cartTagInfo = rect
+            that.headTop = rect.top
+            // console.log(that.headTop)
+          })
+          .exec();
+      }, 100)
+      // this.$nextTick(()=>{
+      //   this.$refs.shortPopupRef.open();
+      // })
+    },
+    computed: {
+      downMenus: function() {
+        return this.downMenu.filter((item) => {
+          if (this.mer_location) {
+            return item
+          } else {
+            return item.key < 3
+          }
+        })
+      },
+      ...configMap({
+        margin_ico_switch: 0,
+        margin_ico: '',
+        mer_location: 0,
+        store_street_theme: 1,
+        hide_mer_status: '',
+      }, mapGetters(['viewColor', 'keyColor'])),
+    },
+    methods: {
+      async getCloundShop() {
+        const {
+          data
+        } = await getCategoryListLevel({
+          type: 2
+        })
+        this.cloudList = data;
+        this.cloudList.unshift({
+          cate_name: '全部',
+          children: [],
+          pic: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/de2be202312151001024597.png",
+          store_category_id: -1
+        })
+        this.cloudList.forEach((item)=>{
+          item.children.unshift({
+            cate_name: '全部',
+            store_category_id: item.store_category_id,
+          });
+        })
+        this.merchant = this.cloudList[0];
+        this.merchantTow = this.merchant?.children[0];
+        this.storeParam.category_id = this.merchantTow.store_category_id;
+        this.getStoreList();
+        return null;
+      },
+      selectLocation() {
+        this.isSelectPlace ? this.showPicker = true : ''
+      },
+      confirm(e) {
+        this.showPicker = false
+        this.$emit('selectPlce', e)
+        this.$emit('change', e)
+        this.street = e.value[1].name
+        this.$nextTick(() => {
+          this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+        })
+        this.storeParam.street_id = e.value[1].code
+        this.street_id = e.value[1].code
+        this.getStoreList()
+      },
+      changeHandler(e) {
+        const {
+          columnIndex,
+          value,
+          values,
+          index,
+          picker = this.$refs.uPicker
+        } = e;
+        if (columnIndex === 0) {
+          getStreet({
+            area_code: value[0]['code']
+          }).then(res => {
+            picker.setColumnValues(1, res.data);
+          });
+        }
+      },
+      Area() {
+        getArea({
+          city_code: 510500
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(0, res.data);
+          this.Street(res.data[0]['code']);
+          // console.log(res.data, 66666)
+        });
+      },
+      Street(code) {
+        getStreet({
+          area_code: code
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(1, res.data);
+
+        });
+      },
+
+      onInputConfirm() {
+        this.showSerch = false
+        this.searchSubmit()
+      },
+      // 对象转数组
+      objToArr(data) {
+        let obj = Object.keys(data).sort();
+        let m = obj.map(key => data[key]);
+        return m;
+      },
+      hotSerchFn(keywords) {
+        this.storeParam.keyword = keywords
+        this.searchSubmit()
+      },
+      navGoto(url) {
+        uni.redirectTo({
+          url
+        })
+      },
+      navgo(url) {
+        uni.navigateTo({
+          url
+        })
+      },
+      // 获取商户分类
+      getClassfication: function() {
+        let temp = []
+        merClassifly()
+          .then(res => {
+            temp = res.data.map(item => {
+              return {
+                ...item,
+                check: false
+              }
+            })
+            if (this.storeParam.category_id.length > 0) {
+              this.storeParam.category_id.forEach((ids, index) => {
+                temp.forEach(el => {
+                  if (ids == el.category_id) {
+                    el.check = true
+                  }
+                })
+              })
+            }
+            this.merList = temp
+          })
+          .catch(res => {
+            this.$util.Tips({
+              title: res
+            });
+          });
+      },
+      // 获取店铺类型
+      getStoreType: function() {
+        let temp = []
+        getStoreTypeApi().then(res => {
+            res.data.forEach(item => {
+              if (item.mer_type_id == this.storeParam.type_id) {
+                temp.push({
+                  ...item,
+                  check: true
+                })
+              }
+            })
+            this.storeTypeArr = temp
+          })
+          .catch(res => {
+            this.$util.Tips({
+              title: res
+            });
+          });
+      },
+      /** 打开地图**/
+      showMaoLocation(lat, long) {
+        if (!lat || !long) return this.$util.Tips({
+          title: '请设置允许商城访问您的位置！'
+        });
+        //#ifdef H5
+        if (this.$wechat.isWeixin() === true) {
+          this.$wechat.seeLocation({
+            latitude: Number(lat),
+            longitude: Number(long),
+            name: '当前位置',
+            address: this.location_address
+          }).then(res => {
+            // console.log('success');
+          })
+        } else {
+          //#endif
+          uni.openLocation({
+            latitude: parseFloat(lat),
+            longitude: parseFloat(long),
+            name: '当前位置',
+            address: this.location_address,
+            scale: 8,
+            success: function(res) {
+              // console.log(res)
+            },
+          });
+          // #ifdef H5
+        }
+        //#endif	
+      },
+      showStoreLocation(item) {
+        if (!item.lat || !item.long) return this.$util.Tips({
+          title: '请设置允许商城访问您的位置！'
+        });
+        //#ifdef H5
+        if (this.$wechat.isWeixin() === true) {
+          this.$wechat.seeLocation({
+            latitude: Number(item.lat),
+            longitude: Number(item.long),
+            name: item.mer_name,
+            address: item.mer_address ? item.mer_address : '',
+          }).then(res => {
+            // console.log('success');
+          })
+        } else {
+          //#endif
+          uni.openLocation({
+            latitude: parseFloat(item.lat),
+            longitude: parseFloat(item.long),
+            scale: 8,
+            name: item.mer_name,
+            address: item.mer_address ? item.mer_address : '',
+            success: function(res) {
+              // console.log(res)
+            },
+          });
+          // #ifdef H5
+        }
+        //#endif	
+      },
+      selfLocation() {
+        let self = this
+        if (uni.getStorageSync('RejectTarget')){
+          this.getStoreList(); 
+          return;
+        }
+        if (this.$store?.state?.storage?.location?.lat) {
+          this.latitude = this.$store?.state?.storage?.location?.lat;
+          this.longitude = this.$store?.state?.storage?.location?.long;
+          getGeocoder({
+            lat: this.latitude,
+            long: this.longitude
+          }).then(res => {
+            // console.log(res)
+            this.detaile_address = res.data.address;
+            this.location_address = res.data.address;
+            this.recommend_address = res.data.address.length > 4 ? res.data.address
+              .slice(0, 4) + '...' :
+              res.data.address;
+            this.getStoreList();
+          }).catch(err => {
+            uni.showToast({
+              title: err,
+              icon: 'none'
+            })
+            this.getStoreList();
+          })
+        } else uni.getLocation({
+          type: 'gcj02',
+          success: (res) => {
+            console.log('定位');
+            let latitude, longitude;
+            latitude = res.latitude.toString();
+            longitude = res.longitude.toString();
+            this.latitude = res.latitude.toFixed(6);
+            this.longitude = res.longitude.toFixed(6);
+            this.$store.commit('setLocation', {
+              lat: res.latitude.toFixed(6),
+              long: res.longitude.toFixed(6),
+            });
+            getGeocoder({
+              lat: latitude,
+              long: longitude
+            }).then(res => {
+              // console.log(res)
+              this.detaile_address = res.data.address;
+              this.location_address = res.data.address;
+              this.recommend_address = res.data.address.length > 4 ? res.data.address
+                .slice(0, 4) + '...' :
+                res.data.address
+              this.getStoreList();
+            }).catch(err => {
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+              this.getStoreList();
+            })
+          },
+          fail: (res) => {
+            uni.showToast({
+              title: res,
+              icon: 'none',
+              duration: 1000
+            });
+            this.getStoreList();
+          },
+        });
+      },
+      // 进店
+      goStore(id) {
+        if (this.storeParam.type_id == 12) {
+          uni.navigateTo({
+            url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+          })
+        } else {
+          if (this.hide_mer_status != 1) {
+            uni.navigateTo({
+              url: `/pages/store/home/index?id=${id}&type=7`
+            })
+          }
+        }
+      },
+      // 搜索
+      searchSubmit: function() {
+        console.log('搜索', this.storeParam.keyword);
+        let that = this;
+        that.$set(that.storeParam, 'keyword', this.storeParam.keyword);
+        this.set_where('')
+        this.showSerch = false
+      },
+      //点击事件处理
+      set_where: function(e) {
+        if (this.loading) return
+        this.storeList = []
+        this.storeParam.page = 1
+        // this.storeParam.order = this.downMenu[e].order
+        // this.storeParam.order = 'location' //使用距离进行排序
+        this.storeParam.order = e //选择排序方式
+        this.getStoreList();
+        if(e=='procure_price_asc') return this.price_order = 'procure_price_desc';
+        if(e=='procure_price_desc') return this.price_order = 'procure_price_asc';
+      },
+      backjJump() {
+        uni.navigateBack({
+          delta: 1
+        })
+      },
+      // 点击商品一级分类
+      changeMerchant(item, type=false) {
+        this.merchant = item;
+        this.merchantTow = item.children[0];
+        this.storeParam.category_id = item.children[0].store_category_id;
+        this.storeParam.page = 1;
+        this.goodsList = [];
+        if(type) this.$refs.allRef.close();
+        this.getStoreList()
+      },
+      // 点击商品二级分类
+      changeMerchantTow(item){
+        this.merchantTow = item;
+        this.storeParam.category_id = this.merchantTow.store_category_id;
+        this.storeParam.page = 1;
+        this.getStoreList()
+      },
+      // 商品列表
+      getStoreList(load=false) {
+        this.showLoading = true
+        this.status = "loading"
+        if(!load) {
+          this.storeParam.page = 1;
+          this.goodsList = [];
+        }
+        // console.log({...this.userInfoData});
+        let query = {
+          product_type: this.product_type,
+          // cate_pid: this.storeParam.category_id,
+          page: this.storeParam.page,
+          order: this.storeParam.order,
+          // sys_labels: this.storeParam.sys_labels,
+          keyword: this.storeParam.keyword
+        };
+        if(this.storeParam.category_id==-1) null;
+        else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
+        else query.cate_id = this.storeParam.category_id; // 否则查询二级分类
+        getProductslist(query).then((res)=>{
+          // console.log(res);
+          this.goodsList = [...this.goodsList, ...res.data.list]
+          this.goodsList.forEach(item => {
+            this.trnList.push({
+              left: 0,
+              bottom: 0
+            })
+          })
+          this.showLoading = false;
+        }).catch(e=>{
+          console.log(e);
+          Toast(e.msg||e.message||e)
+          this.showLoading = false;
+        })
+        // townCloud({
+        //   street_code: this.street_id,
+        //   category_id: this.storeParam.category_id,
+        //   order: this.storeParam.order,
+        //   keyword: this.storeParam.keyword,
+        //   page: this.storeParam.page,
+        //   location: this.latitude+','+this.longitude,
+        // }).then(res => {
+        //   this.goodsList = [...this.goodsList, ...res.data.list]
+        //   this.showLoading = false
+        //   this.goodsList.forEach(item => {
+        //     this.trnList.push({
+        //       left: 0,
+        //       bottom: 0
+        //     })
+        //   })
+        // }).catch(e=>{
+        //   Toast(e.msg||e.message||e)
+        //   this.showLoading = false;
+        // })
+      },
+      loadMoreLeft() {
+        // 加载更多左侧内容的逻辑
+      },
+      loadMoreRight() {
+        // 加载更多右侧内容的逻辑
+        this.storeParam.page++;
+        this.getStoreList(true);
+      },
+      // 购物车信息
+      cartFn() {
+        getCartList({
+          product_type: 98,
+          source: this.storeParam.sys_labels
+        }).then(res => {
+          this.totalMoney = 0
+          this.cartList = res.data.list
+          this.cartList.forEach(e => {
+            e.list.forEach(item => {
+              this.totalMoney += item.cart_num * item.productAttr.procure_price
+            })
+          })
+          this.totalMoney = this.totalMoney.toFixed(2)
+        })
+        getCartCounts({
+          product_type: 98,
+          source: this.storeParam.sys_labels
+        }).then(res => {
+          this.goodsNum = res.data[0].count
+        })
+      },
+      // 点击商品
+      clickProduct(data){
+        this.$refs.shortPopupRef.setDatas(data, this.goodsNum);
+        this.$refs.shortPopupRef.open();
+      },
+      // 点击全部
+      showAllRef(){
+        this.$refs.allRef.open();
+      },
+      changeAllRef(e){
+        this.allShow = e.show;
+      },
+      // 搜索
+      navToSearch(){
+        uni.navigateTo({
+          url: `/pages/columnGoods/goods_search/index?back=${true}&searchVal=${this.storeParam.keyword}`,
+          success:()=> {
+            uni.$once('searchValue', (e)=>{
+              this.storeParam.keyword = e;
+              this.searchSubmit();
+            })
+          }
+        })
+      },
+      // 刷新购物车
+      loadCart(){
+        this.cartFn();
+      },
+      // 获取规格名称
+      getSkuName(data){
+        try{
+          let str = [];
+          data?.product?.attrValue.forEach((e)=>{
+            if(e.detail){
+              Object.keys(e.detail).forEach((c)=>{
+                str.push((e.detail[c]))
+              })
+            }
+          })
+          // return Object.keys(data?.sku)?.join('/')||null;
+          return str.join('/') || '';
+        }catch(e){
+          return ''
+        }
+      },
+      // 获取第一个规格
+      getAttr(data){
+        try{
+          return data?.product?.attrValue[0]||{}
+        }catch(e){
+          return {}
+        }
+      },
+      // 选择位置
+      changeMap(){
+        uni.navigateTo({
+          url: `/pages/select_address/select_address_n`,
+          success:()=> {
+            uni.$once('changeAddress', (e)=>{
+              this.street_id = e.street.code;
+              this.storeParam.street_id = this.street_id;
+              this.street = e.street.name;
+              if (e.longitude) {
+                this.longitude = e.longitude;
+                this.latitude = e.latitude;
+                this.$store.commit('setLocation', {
+                  lat: e.longitude,
+                  long: e.latitude,
+                });
+              }
+              this.getStoreList(true);
+            })
+          }
+        })
+      }
+    },
+    //刷新
+    onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    },
+    onShow() {
+      this.showSelect = false;
+      this.cartFn();
+    },
+    // 页面返回
+    onBackPress() {
+      if(this.$refs.shortPopupRef.isShow){
+        this.$refs.shortPopupRef.close();
+        return true;
+      } else if(this.allShow){
+        this.$refs.allRef.close();
+        return true;
+      }
+      else return false;
+    }
+
+  }
+</script>
+
+<style lang="scss" scoped>
+  * {
+    margin: 0;
+    padding: 0;
+  }
+
+  page {
+    background-color: #f5f5f5;
+  }
+  
+  .all_ref{
+    height: 100vh;
+    width: 510rpx;
+    background-color: #fff;
+    padding: 30rpx;
+    .header{
+      height: 100rpx;
+      font-size: 33rpx;
+      font-weight: bold;
+      display: flex;
+      align-items: center;
+    }
+    .all_list{
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      align-items: flex-start;
+    }
+    .menu_li {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      width: 150rpx;
+      height: 150rpx;
+      overflow: hidden;
+    
+      // width: 120rpx;
+      // display: inline-block;
+      .image {
+        border-radius: 50%;
+        border: 5rpx solid #fff;
+      }
+    
+      .li_text {
+        width: 100%;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        text-align: center;
+        padding: 4rpx 10rpx;
+      }
+    }
+    
+    .menu_li_on {
+      .image {
+        border: 5rpx solid #ff6d20;
+        border-radius: 50%;
+      }
+    
+      .li_text {
+        background-color: #ff6d20;
+        border-radius: 2em;
+        color: #fff;
+        padding: 4rpx 10rpx;
+      }
+    }
+  }
+
+  .com_name {
+    font-size: 33.29rpx;
+    // background-color: red;
+    // max-width: 45vw;
+    max-width: 40vw;
+    white-space: nowrap;
+    /* 防止文字换行 */
+    overflow: hidden;
+    /* 超出部分隐藏 */
+    text-overflow: ellipsis;
+    /* 使用省略号表示溢出的内容 */
+    // width: 200px;
+    /* 可根据实际情况调整容器宽度 */
+  }
+
+  .head_tit {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+
+  }
+
+  .productList {
+    // padding-top: 50rpx;
+    // padding: 0 20rpx 0;
+    display: flex;
+    flex-direction: column;
+
+    .top {
+    	padding-top: var(--status-bar-height);
+    	/* #ifdef H5 */
+    	padding-top: 30rpx;
+    	/* #endif */
+    	background-color: #F0F2F5;
+    	position: fixed;
+    	z-index: 10;
+    	width: 100%;
+    	top: 0;
+    }
+    
+
+    .content {
+      flex: 1;
+      padding: 0 20rpx 10rpx 20rpx;
+    }
+
+    .menu_cls {
+      // background-color: white;
+      // height: 199.77rpx;
+      border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+      padding: 10rpx 70rpx 0 0;
+      font-size: 26.29rpx;
+      height: 155rpx;
+      overflow: hidden;
+      position: relative;
+      
+      .all{
+        position: absolute;
+        top: 0;
+        right: 0;
+        padding: 0 15rpx;   
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+        background-color: #f5f5f5;
+        image{
+          width: 30rpx;
+          height: 30rpx;
+        }
+      }
+
+      .menu_li {
+        // margin-right: 20rpx;
+        // background-color: red;
+        // width: 50vw;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        min-width: 140rpx;
+        height: auto;
+
+        // width: 120rpx;
+        // display: inline-block;
+        .image {
+          border-radius: 50%;
+          border: 5rpx solid #fff;
+        }
+
+        .li_text {
+          width: 100%;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          text-align: center;
+          padding: 1rpx 10rpx 4rpx 10rpx;
+        }
+      }
+
+      .menu_li_on {
+        .image {
+          border: 5rpx solid #ff6d20;
+          border-radius: 50%;
+        }
+
+        .li_text {
+          background-color: #ff6d20;
+          border-radius: 2em;
+          color: #fff;
+          padding: 1rpx 10rpx 4rpx 10rpx;
+        }
+      }
+
+    }
+
+    .container {
+      display: flex;
+      height: calc(100vh - 320rpx - var(--status-bar-height));
+
+      .left-panel {
+        width: 180rpx;
+        height: 100%;
+        font-size: 29.79rpx;
+        flex-shrink: 0;
+
+        .left-panel_item {
+          height: 100rpx;
+          line-height: 100rpx;
+          text-align: center;
+          box-sizing: border-box;
+          padding-left: 10rpx;
+          max-width: 180rpx;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        .left-panel_item_active {
+          color: #F84221;
+          background-color: rgba(#F84221, 0.1);
+          position: relative;
+
+          &::before {
+            content: '';
+            display: inline-block;
+            width: 10rpx;
+            height: 40rpx;
+            border-radius: 5rpx;
+            background-color: #F84221;
+            position: absolute;
+            left: 0;
+            top: 0;
+            transform: translate(0, 75%);
+          }
+        }
+      }
+
+      .right-panel {
+        width: calc(100vw - 180rpx);
+        height: 100%;
+        font-size: 26.29rpx;
+        background-color: #fff;
+
+        .right-panel-head {
+          height: 70rpx;
+          box-sizing: border-box;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          padding-right: 30rpx;
+          color: #737373;
+
+          view {
+            display: flex;
+            align-items: center;
+            margin-left: 40rpx;
+          }
+
+          .active {
+            color: #333;
+            font-weight: bold;
+          }
+          
+          .icon{
+            height: 22rpx;
+            width: 18rpx;
+          }
+        }
+
+        .right-panel-view {
+          height: calc(100vh - 400rpx - var(--status-bar-height) - 100rpx);
+
+          .short_item {
+            padding: 20rpx;
+            display: flex;
+
+            .image {
+              height: 145.23rpx;
+              width: 145.23rpx;
+              border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+              margin-right: 20rpx;
+              flex-shrink: 0;
+            }
+
+            .short_item_right {
+              flex: 1;
+              display: flex;
+              flex-direction: column;
+              justify-content: space-between;
+
+              .r_name {
+                width: 100%;
+                height: 64rpx;
+                line-height: 32rpx;
+                text-overflow: ellipsis;
+                display: -webkit-box; /* 使用弹性盒子布局 */
+                -webkit-box-orient: vertical; /* 设置为垂直方向布局 */
+                overflow: hidden; /* 隐藏超出部分 */
+                -webkit-line-clamp: 2; /* 限制显示两行文本 */
+              }
+
+              .r_type {
+                font-size: 22.78rpx;
+                color: #737373;
+                width: 300rpx;
+
+                view {
+                  height: 39rpx;
+                  line-height: 39rpx;
+                  background: #FEF5F3;
+                  display: inline-block;
+                  padding: 0 16rpx;
+                  border-radius: 39rpx;
+                  max-width: 100%;
+                  overflow: hidden;
+                  white-space: nowrap;
+                  text-overflow: ellipsis;
+                }
+              }
+
+              .r_btn {
+                display: flex;
+                justify-content: space-between;
+                font-size: 22.78rpx;
+                color: #F84221;
+                align-items: center;
+              }
+            }
+          }
+        }
+      }
+    }
+
+    .common-hd {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 60rpx;
+      margin-top: 30rpx;
+
+      .title {
+        padding: 0 80rpx;
+        font-size: 34rpx;
+        color: $theme-color;
+        font-weight: bold;
+        background-image: url("~@/static/images/index-title.png");
+        background-repeat: no-repeat;
+        background-size: 100% auto;
+        background-position: left center;
+      }
+    }
+
+    .goods_list {
+      margin-top: 20rpx;
+
+      .goods_card {
+        margin-top: 20rpx;
+        height: auto;
+        background-color: white;
+        padding: 20rpx;
+        // border-radius: 20rpx;
+        display: flex;
+        // align-items: center;
+
+        .left {
+          margin-right: 20rpx;
+          width: 158rpx;
+          height: 158rpx;
+          border-radius: 20rpx;
+          overflow: hidden;
+        }
+
+        .right {
+          flex: 1;
+          color: #737373;
+
+          .head {
+            font-weight: bold;
+            // color: red;
+            color: #333;
+
+          }
+
+          .li {
+            width: 100%;
+            display: flex;
+            font-size: 28.04rpx;
+            margin-bottom: 10rpx;
+            align-items: center;
+
+            text {
+              margin: 0 20rpx 0 5rpx;
+            }
+          }
+        }
+      }
+    }
+
+    .address {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 200px;
+    }
+  }
+
+  .selects {
+    transform: rotate(180deg);
+  }
+
+
+
+  .search-right.styleType2 .right-text,
+  .search-right.styleType3 .right-text {
+    color: #282828;
+  }
+
+  .search-right.styleType2 .icon-xiangyou,
+  .search-right.styleType3 .icon-xiangyou {
+    color: #999999;
+  }
+
+  .search-right.styleType2 .icon-dingwei,
+  .search-right.styleType3 .icon-dingwei {
+    color: #8A8A8A;
+  }
+
+  .productList .search .back {
+    display: flex;
+    align-items: center;
+    width: 40rpx;
+    height: 60rpx;
+
+    .iconfont {
+      color: #fff;
+      font-size: 36rpx;
+    }
+  }
+
+  .town_name {
+    overflow: hidden;
+    white-space: nowrap;
+    /* 设置文本不换行 */
+    text-overflow: ellipsis;
+    max-width: 4.2em;
+    font-size: 28rpx;
+    /* 设置溢出文本为省略号 */
+  }
+
+  .hot_serch {
+    height: 0rpx;
+  }
+
+  .productList .search .input {
+    flex: 1;
+    height: 60rpx;
+    background-color: #fff;
+    border-radius: 50rpx;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+  }
+
+  .productList .search.styleType2 .input,
+  .productList .search.styleType3 .input {
+    background: #EDEDED;
+  }
+
+  .productList .search .input input {
+    flex: 1;
+    height: 100%;
+    font-size: 26rpx;
+    margin-left: 10rpx;
+  }
+
+  .productList .search .input .placeholder {
+    color: #999;
+  }
+
+  .productList .search .input .iconfont {
+    font-size: 35rpx;
+    color: #555;
+  }
+
+  .productList .search .icon-pailie,
+  .productList .search .icon-tupianpailie {
+    color: #fff;
+    width: 62rpx;
+    font-size: 40rpx;
+    height: 86rpx;
+    line-height: 86rpx;
+  }
+
+  .productList .nav-wrapper {
+    z-index: 9;
+    position: fixed;
+    left: 0;
+    top: 25px;
+    width: 100%;
+    margin-top: 86rpx;
+    background-color: #fff;
+
+    &.styleType1 {
+      background-color: var(--view-theme);
+    }
+
+    .tab-bar {
+      display: flex;
+      align-items: center;
+
+      .tab-item {
+        position: relative;
+        flex: 1;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 8rpx 0 20rpx;
+        color: #fff;
+        font-size: 28rpx;
+        font-weight: bold;
+
+        &::after {
+          content: ' ';
+          position: absolute;
+          left: 50%;
+          bottom: 18rpx;
+          width: 30rpx;
+          height: 3rpx;
+          background: transparent;
+          transform: translateX(-50%);
+        }
+
+        &.on {
+          &::after {
+            background: #fff;
+          }
+        }
+      }
+    }
+  }
+
+  .border-picture {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: center/cover no-repeat;
+  }
+
+  .productList .nav {
+    height: 86rpx;
+    color: #454545;
+    font-size: 28rpx;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 28rpx;
+  }
+
+  .productList .nav .item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    color: #FFFFFF;
+    flex: 1;
+  }
+
+  .productList .nav.styleType2 .item,
+  .productList .nav.styleType3 .item {
+    color: #282828;
+  }
+
+  .productList .nav .item.font-colors {
+    font-weight: 500;
+    color: #FFFFFF;
+  }
+
+  .productList .nav.styleType2 .item.font-colors,
+  .productList .nav.styleType3 .item.font-colors {
+    color: var(--view-theme);
+  }
+
+  .productList .nav .item .font-line {
+    height: 4rpx;
+    background-color: #fff;
+    margin-top: 3rpx;
+    width: 28rpx;
+    animation: line 0.3s;
+    -moz-animation: line 0.3s;
+    /* Firefox */
+    -webkit-animation: line 0.3s;
+    /* Safari 和 Chrome */
+    -o-animation: line 0.3s;
+    /* Opera */
+  }
+
+  .productList .nav.styleType2 .item .font-line,
+  .productList .nav.styleType3 .item .font-line {
+    background-color: var(--view-theme);
+  }
+
+  @keyframes line {
+    from {
+      width: 0rpx;
+    }
+
+    to {
+      width: 28rpx;
+    }
+  }
+
+  .productList .nav .item image {
+    width: 15rpx;
+    height: 19rpx;
+    margin-left: 10rpx;
+  }
+
+  .selected-list {
+    padding: 24rpx 14rpx;
+    border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+    background-color: #fff;
+    position: absolute;
+    left: 100rpx;
+    font-size: 29.79rpx;
+    opacity: 0;
+    transition: 0.5s;
+    height: 0;
+
+
+    .triangle-up {
+      width: 0;
+      height: 0;
+      border-left: 10rpx solid transparent;
+      border-right: 10rpx solid transparent;
+      border-bottom: 10rpx solid white;
+      position: absolute;
+      top: -10rpx;
+    }
+
+    .selected-li {
+      margin-bottom: 35rpx;
+      color: #F84221;
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  .actSel {
+    opacity: 1;
+    height: auto;
+    // transform: translateX(100rpx);
+
+  }
+
+  .store-wrapper {
+    margin-top: 235rpx;
+    border-top: 1px solid #F6F6F6;
+
+    .store-item {
+      margin: 20rpx auto;
+
+      .head {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #fff;
+
+        .zhezhao {
+          position: absolute;
+          width: 95%;
+          height: 150px;
+          border-radius: 20rpx;
+          z-index: 0;
+          opacity: 0.5;
+          background-color: #999;
+        }
+
+        .bgc_img {
+          position: absolute;
+          width: 95%;
+          height: 150px;
+          background-size: cover;
+          border-radius: 20rpx;
+          z-index: 0;
+        }
+
+        .zhezhao1 {
+          width: 100%;
+          height: 150px;
+          border-radius: 20rpx;
+          z-index: 1;
+
+          .title {
+            display: flex;
+            height: 50px;
+            align-items: center;
+            margin-left: 20px;
+            z-index: 1;
+
+            span {
+              background-color: #F84221;
+              color: white;
+              font-size: 12px;
+              padding: 3px;
+              border-radius: 5px;
+              margin-left: 5px;
+            }
+          }
+
+          .coent {
+            display: flex;
+            margin-left: 20px;
+
+            .avater {
+              width: 60px;
+              height: 80px;
+
+              image {
+                width: 60px;
+                height: 80px;
+              }
+            }
+
+            .text {
+              .text_one {
+                display: flex;
+                height: 30px;
+                line-height: 30px;
+                padding-left: 10px;
+
+                image {
+                  width: 20px;
+                  height: 20px;
+                  margin-right: 10px;
+                }
+
+                .text_one_r {
+                  margin-left: 10px;
+                }
+              }
+
+              .text_two {
+                width: 270px;
+                height: 30px;
+                line-height: 30px;
+                padding-left: 10px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+
+                image {
+                  width: 20px;
+                  height: 20px;
+                  margin-right: 10px;
+                }
+              }
+
+              .text_three {
+                width: 270px;
+                height: 30px;
+                line-height: 30px;
+                padding-left: 10px;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
+
+                image {
+                  width: 20px;
+                  height: 20px;
+                  margin-right: 10px;
+                }
+              }
+            }
+
+          }
+        }
+
+
+      }
+
+      .pro-box {
+        white-space: nowrap;
+        display: flex;
+        align-items: center;
+        padding: 20rpx 20rpx 30rpx;
+
+        .pro-item {
+          display: inline-block;
+          width: 218rpx;
+          margin-right: 14rpx;
+
+          .picture,
+          /deep/image,
+          uni-image {
+            width: 100%;
+            height: 214rpx;
+            border-radius: 8rpx;
+            position: relative;
+          }
+
+          .price {
+            margin-top: 5rpx;
+            font-size: 28rpx;
+            color: var(--view-priceColor);
+            font-weight: bold;
+
+            text {
+              font-size: 28rpx;
+            }
+          }
+
+          &:last-child {
+            margin-right: 0;
+          }
+        }
+
+        &.styleType3 {
+          padding: 20rpx;
+
+          .pro-item {
+            display: inline-block;
+            background-color: #fff;
+            border-radius: 16rpx;
+            text-align: center;
+            padding: 10rpx 0 20rpx;
+
+            .picture,
+            /deep/image,
+            uni-image {
+              width: 194rpx;
+              height: 194rpx;
+              text-align: center;
+              border-radius: 8rpx;
+              position: relative;
+              margin: 0 auto;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .mer-item2 {
+    padding: 20rpx;
+    background: #fff;
+    margin-bottom: 20rpx;
+    border-radius: 16rpx;
+
+    .mer-shop-count {
+      display: flex;
+
+      .mer-avatar {
+        width: 100rpx;
+        height: 100rpx;
+      }
+
+      .mer-top {
+        color: #282828;
+      }
+
+      .mer-shop-right {
+        margin-left: 20rpx;
+
+        .mer-btn {
+          color: #666666;
+        }
+
+      }
+
+      .pro-box {
+        white-space: nowrap;
+        display: flex;
+        align-items: center;
+        margin-top: 20rpx;
+
+        .pro-item {
+          display: inline-block;
+          width: 170rpx;
+          margin-right: 20rpx;
+
+          .picture,
+          /deep/image,
+          uni-image,
+          /deep/.easy-loadimage {
+            width: 100%;
+            height: 170rpx;
+            border-radius: 8rpx;
+            position: relative;
+          }
+
+          .price {
+            margin-top: 5rpx;
+            font-size: 28rpx;
+            color: var(--view-priceColor);
+            font-weight: bold;
+
+            text {
+              font-size: 28rpx;
+            }
+          }
+
+          &:last-child {
+            margin-right: 0;
+          }
+        }
+      }
+    }
+
+  }
+
+  .no-shop {
+    background-color: #fff;
+    // padding-bottom: calc(100% - 176rpx);
+
+    .pictrue {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      color: $uni-nothing-text;
+
+      image {
+        width: 500rpx;
+        height: 180rpx;
+      }
+    }
+  }
+
+  .guanbi {
+    width: 20px;
+    height: 20px;
+    margin: 30px auto;
+  }
+
+  .img_cls {
+    position: absolute;
+    top: 50%;
+    right: 7rpx;
+    transform: translateY(-50%);
+
+  }
+
+  .pop {
+    z-index: 1;
+  }
+
+  .sswz {
+    margin-top: 10rpx;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 0 20rpx;
+  }
+
+  .score {
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+    font-size: 24rpx;
+    line-height: 1;
+    color: #000;
+
+    .score-title {
+      margin-right: 15rpx;
+
+    }
+
+    .score_text {
+      color: #fd5d2e;
+    }
+
+    .star {
+      position: relative;
+      width: 111rpx;
+      height: 19rpx;
+      margin-right: 10rpx;
+      background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
+      overflow: hidden;
+
+      view {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+
+        &.star_purple {
+          background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
+        }
+      }
+    }
+  }
+  
+  .card {
+    width: 720rpx;
+    z-index: 99;
+    // margin:auto;
+    left: 50%;
+    transform: translateX(-50%);
+    position: fixed;
+    // bottom: 0;
+    background-color: #333333;
+    height: 101.64rpx;
+    border-radius: 50.82rpx;
+    overflow: hidden;
+    color: white;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+  
+    .left {
+      display: flex;
+      align-items: center;
+      padding: 10rpx 35rpx;
+      
+      .badge {
+        position: absolute;
+        top: 0;
+        right: 0;
+        background-color: #F84221;
+        transform: translate(50%, -50%);
+        // padding: 10rpx 10rpx;
+        border-radius: 35rpx;
+        text-align: center;
+        width: 35rpx;
+        line-height: 35rpx;
+        height: 35rpx;
+      }
+  
+      .tot_price {
+        display: flex;
+        margin-left: 42rpx;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+    }
+  
+    .right {
+      font-size: 33.29rpx;
+      line-height: 50px;
+      background: linear-gradient(to right, #F84221, #FF6D20);
+      width: 140.19rpx;
+      text-align: center;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/cloud_entrepot/indexb.vue b/pages/nongKe/cloud_entrepot/indexb.vue
index e13e933..aafb73e 100644
--- a/pages/nongKe/cloud_entrepot/indexb.vue
+++ b/pages/nongKe/cloud_entrepot/indexb.vue
@@ -711,7 +711,7 @@
         // console.log({...this.userInfoData});
         let query = {
           product_type: this.product_type,
-          cate_pid: this.storeParam.category_id,
+          // cate_pid: this.storeParam.category_id,
           page: this.storeParam.page,
           order: this.storeParam.order,
           keyword: this.storeParam.keyword
diff --git a/pages/nongKe/supply_chain/shopping_trolley_other.vue b/pages/nongKe/supply_chain/shopping_trolley_other.vue
new file mode 100644
index 0000000..afe4e34
--- /dev/null
+++ b/pages/nongKe/supply_chain/shopping_trolley_other.vue
@@ -0,0 +1,1370 @@
+<template>
+  <view :style="viewColor">
+    <view class='shoppingCart' :class="(newData.status && newData.status.status) ? 'showFoot' : ''">
+      <view class='labelNav acea-row row-around row-middle'>
+        <view class='item'><text class='iconfont icon-xuanzhong'></text>100%正品保证</view>
+        <view class='item'><text class='iconfont icon-xuanzhong'></text>所有商品精挑细选</view>
+        <view class='item'><text class='iconfont icon-xuanzhong'></text>售后无忧</view>
+      </view>
+      <view class='nav acea-row row-between-wrapper'>
+        <view>购物数量 <text class='num t-color'>{{cartTotalCount}}</text></view>
+        <view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
+          class='administrate acea-row row-center-wrapper' @click='manage'>{{ footerswitch ? '管理' : '取消'}}</view>
+      </view>
+      <view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0">
+        <view class='list'>
+          <block v-for="(item,index) in cartList.valid" :key="index">
+            <view class='item acea-row row-between-wrapper'>
+              <view class="store-title">
+                <view class="checkbox" @click="storeAllCheck(item,index)">
+                  <text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
+                  <text v-else class="iconfont icon-xuanzhong1"></text>
+                </view>
+                <navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'" class="info">
+                  <text class="iconfont icon-shangjiadingdan"></text>
+                  <view class="name">{{item.mer_name}}</view>
+                  <text class="iconfont icon-xiangyou"></text>
+                </navigator>
+                <view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view>
+                <view class="coupon-btn" v-if="item.credit_buy==1" style="width: auto;padding: 0 10rpx;margin-left: 15rpx;" >支持先货后款</view>
+              </view>
+              <!-- <navigator v-for="goods in item.list" :key="goods.cart_id"
+                :url='"/pages/goods_details/index?id="+goods.product.product_id' hover-class='none'
+                class='picTxt acea-row'> -->
+              <navigator v-for="goods in item.list" :key="goods.cart_id" url='' hover-class='none'
+                class='picTxt acea-row'>
+                <view class="checkbox" @click.stop="goodsCheck(goods,index)">
+                  <text v-if="!goods.check" class="iconfont icon-weixuanzhong"></text>
+                  <text v-else class="iconfont icon-xuanzhong1"></text>
+                </view>
+                <view class='pictrue'>
+                  <image :src='(goods.productAttr && goods.productAttr.image) || goods.product.image'></image>
+                  <!-- <image v-else :src='item.productInfo.image'></image> -->
+                </view>
+                <view class='text'>
+                  <view class='line1'>{{goods.product.store_name}}</view>
+                  <view class='infor line1' v-if="goods.productAttr.sku" @click.stop='changeCart(goods,goods.cart_id)'>
+                    {{goods.productAttr.sku}}
+                    <text class="iconfont icon-xiala1"></text>
+                  </view>
+                  <view v-if="goods.product.once_max_count>0 && goods.product.once_min_count>0" class="buy_limit">
+                    <text v-if="goods.product.once_min_count>0">{{goods.product.once_min_count}}件起购，</text><text
+                      v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件</text>
+                  </view>
+                  <view class='money acea-row row-middle'>
+                    <text>￥{{goods.productAttr.procure_price}}</text>
+                    <view v-if="goods.productAttr.show_svip_price" class="vipImg">
+                      <image src="/static/images/svip.png"></image>
+                    </view>
+                  </view>
+                </view>
+                <view class='carnum acea-row row-center-wrapper'>
+                  <view class="reduce" :class="goods.numSub ? 'on' : ''" @click.stop='subCart(goods)'>-</view>
+                  <view class='num'>{{goods.cart_num}}</view>
+                  <view class="plus" :class="goods.numAdd ? 'on' : ''" @click.stop='addCart(goods)'>+</view>
+                </view>
+              </navigator>
+            </view>
+          </block>
+        </view>
+        <view class='invalidGoods' v-if="cartList.invalid.length > 0">
+          <view class='goodsNav acea-row row-between-wrapper'>
+            <view @click='goodsOpen'><text class='iconfont'
+                :class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>失效商品</view>
+            <view class='del' @click='unsetCart'><text class='iconfont icon-shanchu1'></text>清空</view>
+          </view>
+          <view class='goodsList' :hidden='goodsHidden'>
+            <block v-for="(item,index) in cartList.invalid" :key='index'>
+              <navigator :url="'/pages/goods_details/index?id='+item.product_id"
+                class='item acea-row row-between-wrapper' hover-class='none'>
+                <view class='invalid'>失效</view>
+                <view class='pictrue'>
+                  <image :src='(item.productAttr && item.productAttr.image) || item.product.image'></image>
+
+                </view>
+                <view class='text acea-row row-column-between'>
+                  <view class='line1 name'>{{item.product.store_name}}</view>
+                  <!-- <view class='infor line1' v-if="item.productInfo.attrInfo">属性：{{item.productInfo.attrInfo.suk}}</view> -->
+                  <view class='acea-row row-between-wrapper'>
+                    <!-- <view>￥{{item.truePrice}}</view> -->
+                    <view class='end'>该商品已失效</view>
+                  </view>
+                </view>
+              </navigator>
+            </block>
+          </view>
+        </view>
+      </view>
+      <view class='noCart' v-if="recommend"
+        :style="{marginTop:cartList.invalid.length ==0 && cartList.invalid.length ==0?'170rpx':'' }">
+        <view class='pictrue'>
+          <image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/noCart.png'></image>
+          <view>暂无商品，去添加点什么吧</view>
+        </view>
+        <!-- <recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend> -->
+        <!-- <view class='loadingicon acea-row row-center-wrapper' v-if="hostProduct.length>5 && recommend_switch == 1">
+          <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+        </view> -->
+      </view>
+      <view class='footer acea-row row-between-wrapper' :class="isFooter?'':'on'" v-if="cartList.valid.length > 0">
+        <view>
+          <view class="allcheckbox" @click.stop="checkboxAllChange">
+            <text v-if="!isAllSelect" class="iconfont icon-weixuanzhong"></text>
+            <text v-else class="iconfont icon-xuanzhong1"></text>
+            全选 ({{cartCount}})
+          </view>
+        </view>
+        <view class='money acea-row row-middle settlement' v-if="footerswitch==true">
+          <text class='t-color'>￥{{selectCountPrice}}</text>
+          <form @submit="subOrder" report-submit='true'>
+            <button class='placeOrder' formType="submit">去结算</button>
+          </form>
+        </view>
+        <view class='button acea-row row-middle' v-else>
+          <form @submit="subCollect" report-submit='true'>
+            <button class='bnt bt-color' formType="submit">收藏</button>
+          </form>
+          <form @submit="subDel" report-submit='true'>
+            <button class='bnt' formType="submit">删除</button>
+          </form>
+        </view>
+      </view>
+    </view>
+    <!-- 优惠券弹窗 -->
+    <block v-if="coupon.coupon">
+      <couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone"
+        @ChangCouponsUseState="ChangCouponsUseState"></couponListWindow>
+    </block>
+    <!-- 组件 -->
+    <addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+      @goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
+    <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
+    <view class="foot" v-if="newData.status && newData.status.status">
+      <view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
+        <view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)">
+          <block v-if="item.link == activeRouter">
+            <image :src="item.imgList[0]"></image>
+            <view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
+            </view>
+          </block>
+          <block v-else>
+            <image :src="item.imgList[1]"></image>
+            <view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
+          </block>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { Toast } from '@/libs/uniApi.js'
+  import couponListWindow from '@/components/couponListWindow';
+  import addcartWindow from '@/components/addcartWindow';
+  import {
+    getCartList,
+    getCartCounts,
+    changeCartNum,
+    cartDel
+  } from '@/api/order.js';
+  import {
+    getCoupons,
+    getShopCoupons
+  } from '@/api/api.js';
+  import {
+    getProductHot,
+    collectAll
+  } from '@/api/store.js';
+  import {
+    mapGetters
+  } from "vuex";
+  import recommend from '@/components/recommend';
+  import authorize from '@/components/Authorize';
+  import { configMap } from '@/utils';
+  const app = getApp();
+  export default {
+    props: {
+      image: {
+        type: String,
+        default: '',
+      }
+    },
+    components: {
+      recommend,
+      couponListWindow,
+      addcartWindow,
+      authorize
+    },
+    data() {
+      return {
+        loading: false, //是否加载中
+        loadend: false, //是否加载完毕
+        loadTitle: '加载更多', //提示语
+        isFooter: false,
+        cartCount: 0,
+        goodsHidden: true,
+        footerswitch: true,
+        hostProduct: [],
+        cartList: {
+          valid: [],
+          invalid: []
+        },
+        isAllSelect: true, //全选
+        selectValue: [], //选中的数据
+        selectCountPrice: 0.00,
+        isAuto: false, //没有授权的不会自动授权
+        isShowAuth: false, //是否隐藏授权
+        hotScroll: false,
+        hotPage: 1,
+        hotLimit: 10,
+        //属性是否打开
+        coupon: {
+          'coupon': false,
+          list: [],
+        },
+        // 购物车总数
+        cartTotalCount: 0,
+        recommend: false,
+        productValue: [], //系统属性
+        attr: {
+          cartAttr: false,
+          productAttr: [],
+          productSelect: {
+            procure_price: ''
+          }
+        },
+        isOpen: false, //是否打开属性组件
+        source: '',
+        attrImage: '',
+        isCart: true,
+        cart_id: '',
+        attrValue: '', //已选属性
+        attrTxt: '',
+        uniqueValue: "",
+        newVal: {},
+        goods: {},
+        currSku: '',
+        newData: {},
+        activeRouter: '',
+        type_id:''
+      };
+    },
+    computed: configMap({ hide_mer_status: 1, recommend_switch: 0, navigation: {} }, mapGetters(['isLogin',
+      'viewColor'
+    ])),
+    onReady() {},
+    mounted: function() {},
+    onLoad: function(options) {
+      this.source = options.source
+    },
+    onShow: function() {
+      let that = this
+      let routes = getCurrentPages();
+      let curRoute = routes[routes.length - 1].route
+      this.activeRouter = '/' + curRoute
+      this.getNav();
+      // uni.showTabBar();
+      if (this.isLogin == true) {
+        this.getCartList();
+        this.getCartNum();
+        this.goodsHidden = true;
+        this.footerswitch = true;
+        this.isAllSelect = false; //全选
+        this.selectValue = []; //选中的数据
+        this.isShowAuth = false;
+        uni.setStorage({
+          key: 'invoice_Data',
+          data: {},
+          success: function() {}
+        })
+      } else {
+        setTimeout(() => {
+          this.isAuto = true;
+          this.isShowAuth = true
+        }, 300);
+      }
+    },
+    watch:{
+      isAllSelect(n, o){
+        console.log(n);
+      }
+    },
+    methods: {
+      // 授权关闭
+      authColse: function(e) {
+        // console.log(e, 'authColse')
+        this.isShowAuth = e;
+      },
+      onLoadFun() {
+        this.isShowAuth = false;
+      },
+      goRouter(item) {
+        var pages = getCurrentPages();
+        var page = (pages[pages.length - 1]).$page.fullPath;
+        if (item.link == page) return
+        uni.switchTab({
+          url: item.link,
+          fail(err) {
+            uni.redirectTo({
+              url: item.link
+            })
+          }
+        })
+      },
+      getNav() {
+        this.newData = this.navigation
+        if (this.newData.status && this.newData.status.status) {
+          uni.hideTabBar()
+          this.isFooter = true
+        } else {
+          uni.showTabBar()
+          this.isFooter = false
+        }
+      },
+      // 删除
+      subDel: function(event) {
+        let that = this
+        let type_id = []
+        this.cartList.valid.forEach(el => {
+          el.list.forEach(goods => {
+            if (goods.check) {
+              type_id.push(goods.cart_id)
+            }
+          })
+        })
+        if (type_id.length == 0) {
+          return that.$util.Tips({
+            title: '请选择产品'
+          });
+        } else {
+          cartDel({
+            cart_id: type_id,
+          }).then(res => {
+            this.getCartList();
+            this.getCartNum();
+            return that.$util.Tips({
+              title: res.message,
+              icon: 'success'
+            });
+          }).catch(err => {
+            return that.$util.Tips({
+              title: err
+            });
+          });
+        }
+      },
+      // 收藏
+      subCollect: function(event) {
+        let that = this
+        let type_id = []
+        this.cartList.valid.forEach(el => {
+          el.list.forEach(goods => {
+            if (goods.check) {
+              type_id.push(goods.product_id)
+            }
+          })
+        })
+        if (type_id.length == 0) {
+          return that.$util.Tips({
+            title: '请选择产品'
+          });
+        } else {
+			
+			
+          collectAll({
+            type_id: type_id,
+            type: 1
+          }).then(res => {
+            return that.$util.Tips({
+              title: res.message,
+              icon: 'success'
+            });
+          }).catch(err => {
+            return that.$util.Tips({
+              title: err
+            });
+          });
+        }
+      },
+      onMyEvent: function() {
+        this.$set(this.attr, 'cartAttr', false);
+        this.$set(this, 'isOpen', false);
+      },
+      /**
+       * 默认选中属性
+       *
+       */
+      DefaultSelect: function(goods) {
+        let productAttr = this.attr.productAttr;
+        let value = [];
+        let arr = []
+        // console.log(arr, 'arr')
+        if (this.currSku) {
+          value = this.currSku
+        } else {
+          for (var key in this.productValue) {
+            if (this.productValue[key].stock > 0) {
+              value = this.attr.productAttr.length ? key.split(",") : [];
+              break;
+            }
+          }
+        }
+        for (let i = 0; i < productAttr.length; i++) {
+          this.$set(productAttr[i], "index", value[i]);
+        }
+        let productSelect = this.productValue[value.join(",")];
+        if (productSelect && productAttr.length) {
+          this.$set(
+            this.attr.productSelect,
+            "store_name",
+            goods.product.store_name
+          );
+          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods.product
+            .image);
+          this.$set(this.attr.productSelect, "price", productSelect.price);
+          this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price);
+          this.$set(this.attr.productSelect, "stock", productSelect.stock);
+          this.$set(this.attr.productSelect, "unique", productSelect.unique);
+          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+          this.$set(this, "uniqueValue", productSelect.unique);
+          this.$set(this, "attrValue", value.join(","));
+          this.$set(this, "attrTxt", "已选择");
+          if (productSelect.stock == 0) {
+            this.$set(this.attr.productSelect, "cart_num", 0);
+          } else {
+            this.$set(this.attr.productSelect, "cart_num", 1);
+          }
+        } else if (!productSelect && productAttr.length) {
+          this.$set(
+            this.attr.productSelect,
+            "store_name",
+            goods.product.store_name
+          );
+          this.$set(this.attr.productSelect, "image", goods.product.image);
+          this.$set(this.attr.productSelect, "price", goods.product.price);
+          this.$set(this.attr.productSelect, "procure_price", goods.product.price);
+          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+          this.$set(this.attr.productSelect, "stock", 0);
+          this.$set(this.attr.productSelect, "unique", "");
+          this.$set(this, "uniqueValue", "");
+          this.$set(this.attr.productSelect, "cart_num", 0);
+          this.$set(this, "attrValue", "");
+          this.$set(this, "attrTxt", "请选择");
+        } else if (!productSelect && !productAttr.length) {
+          this.$set(
+            this.attr.productSelect,
+            "store_name",
+            goods.product.store_name
+          );
+          this.$set(this.attr.productSelect, "image", goods.product.image);
+          this.$set(this.attr.productSelect, "price", goods.product.price);
+          this.$set(this.attr.productSelect, "procure_price", goods.product.price);
+          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+          this.$set(this.attr.productSelect, "stock", goods.product.stock);
+          this.$set(this.attr.productSelect, "unique", goods.product.unique || "");
+          this.$set(this, "uniqueValue", goods.product.unique || "");
+          this.$set(this.attr.productSelect, "cart_num", 1);
+          this.$set(this, "attrValue", "");
+          this.$set(this, "attrTxt", "请选择");
+        } else if (productSelect && !productAttr.length) {
+          this.$set(this.attr.productSelect, "store_name", goods.product.store_name);
+          this.$set(this.attr.productSelect, "image", productSelect.image);
+          this.$set(this.attr.productSelect, "price", productSelect.price);
+          this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price);
+          this.$set(this.attr.productSelect, "svip_price", productSelect.svip_price);
+          this.$set(this.attr.productSelect, "stock", productSelect.stock);
+          this.$set(this.attr.productSelect, "unique", productSelect.unique);
+          this.$set(this, "uniqueValue", productSelect.unique);
+          this.$set(this, "attrValue", value.join(","));
+          this.$set(this, "attrTxt", "已选择");
+          if (productSelect.stock == 0) {
+            this.$set(this.attr.productSelect, "cart_num", 0);
+          } else {
+            this.$set(this.attr.productSelect, "cart_num", 1);
+          }
+        }
+        this.goCart(productSelect);
+      },
+      
+      /*
+       * 更改商品属性
+       */
+      changeCart: function(goods, id) {
+        let that = this; 
+        if (that.goods == goods) {
+          that.isOpen = that.attr.cartAttr = true;
+          return
+        } else {
+          that.goods = JSON.parse((JSON.stringify(goods)));
+          that.currSku = goods.productAttr.sku.split(",");
+          that.$set(that.attr, 'productAttr', goods.attr);
+          // console.log(this.attr)
+          const sku = {}
+          that.attrValue = goods.productAttr.sku
+          that.attrImage = goods.product.image
+          goods.attrValue.forEach((itemn) => {
+            sku[itemn.sku] = itemn;
+          })
+          that.$set(that, 'productValue', sku);
+          let productSelect = sku[that.attrValue];
+          that.isOpen = that.attr.cartAttr = true;
+          //打开属性
+          that.DefaultSelect(goods)
+        }
+      },
+      goCart(productSelect) {
+        let that = this;
+        //如果有属性,没有选择,提示用户选择
+        if (
+          that.attr.productAttr.length &&
+          that.isOpen === true &&
+          productSelect.stock == 0
+        )
+          return that.$util.Tips({
+            title: "产品库存不足，请选择其它"
+          });
+        if (that.attr.productSelect.cart_num == 0) {
+          return that.$util.Tips({
+            title: '购买个数不能为0！'
+          })
+        }
+      },
+      attrVal(val) {
+        this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+          .indexn]);
+      },
+      /**
+       * 属性变动赋值
+       *
+       */
+      ChangeAttr: function(res) {
+        let productSelect = this.productValue[res];
+        this.currSku = res;
+        this.newVal = this.productValue[res];
+        if (productSelect) this.$set(this, "uniqueValue", productSelect.unique);
+        if (productSelect && productSelect.stock > 0) {
+          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage);
+          this.$set(this.attr.productSelect, "price", productSelect.price);
+          this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price);
+          this.$set(this.attr.productSelect, "stock", productSelect.stock);
+          this.$set(this.attr.productSelect, "unique", productSelect.unique);
+          this.$set(this, "uniqueValue", productSelect.unique);
+          this.$set(this.attr.productSelect, "cart_num", 1);
+          this.$set(this, "attrValue", res);
+        } else {
+          this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage);
+          this.$set(this.attr.productSelect, "price", productSelect.price);
+          this.$set(this.attr.productSelect, "procure_price", productSelect.procure_price);
+          this.$set(this.attr.productSelect, "stock", 0);
+          this.$set(this.attr.productSelect, "unique", "");
+          this.$set(this.attr.productSelect, "cart_num", 0);
+          this.$set(this, "attrValue", "");
+        }
+      },
+      // 扫码付款
+      scanCode() {
+        var self = this;
+        // #ifdef MP || APP-PLUS
+        wx.scanCode({
+          scanType: ["qrCode", "barCode"],
+          success(res) {
+            Toast(res.result)
+          },
+          fail(res) {
+            // console.log(res);
+          },
+        })
+        // #endif
+      },
+      // 立即下单
+      subOrder: function(event) {
+        let selectValue = []
+        this.cartList.valid.forEach(el => {
+          el.list.forEach(goods => {
+            if (goods.check) {
+              selectValue.push(goods.cart_id)
+            }
+          })
+        })
+        if (selectValue.length > 0) {
+          uni.navigateTo({
+            url: `/pages/users/order_confirm/indexOther?product_type=98&cartId=${selectValue.join(',')}&type_id=12&source=${this.source}`
+          });
+        } else {
+          return this.$util.Tips({
+            title: '请选择产品'
+          });
+        }
+      },
+      // 购物车增加
+      addCart: function(goods, index) {
+        console.log(goods.cart_id);
+        let that = this;
+        changeCartNum(goods.cart_id, {
+          cart_num: goods.cart_num + 1
+        }).then(res => {
+          goods.cart_num = Number(goods.cart_num) + 1
+          // that.cartTotalCount = Number(that.cartTotalCount) + 1;
+          if (goods.hasOwnProperty('productAttr') && goods.cart_num > goods.productAttr.stock) {
+            goods.cart_num = goods.productAttr.stock;
+            goods.numAdd = true;
+            goods.numSub = false;
+            return
+          } else {
+            goods.numAdd = false;
+            goods.numSub = false;
+          }
+          this.cartAllCheck('goodsCheck')
+        }).catch(error => {
+          that.$util.Tips({
+            title: error
+          });
+          // goods.cart_num = Number(goods.cart_num) - 1
+        })
+      },
+      goCat: function() {
+        let that = this;
+        changeCartNum(that.goods.cart_id, {
+          cart_num: that.goods.cart_num,
+          product_attr_unique: that.newVal.unique
+        }).then(res => {
+          if (that.goods.hasOwnProperty('productAttr') && that.goods.cart_num > that.goods.productAttr.stock) {
+            that.goods.cart_num = that.goods.productAttr.stock;
+            that.goods.numAdd = true;
+            that.goods.numSub = false;
+            return
+          } else {
+            that.goods.numAdd = false;
+            that.goods.numSub = false;
+          }
+          that.onMyEvent();
+          that.getCartList(true);
+          that.isAllSelect = false
+
+        }).catch(error => {
+          that.$util.Tips({
+            title: error
+          });
+          // goods.cart_num = Number(goods.cart_num) - 1
+        })
+
+      },
+      // 购物车递减
+      subCart(goods) {
+        let status = false;
+        if (goods.cart_num < 1) status = true;
+        if (goods.cart_num <= 1) {
+          goods.cart_num = 1;
+          goods.numSub = true;
+          status = true;
+        } else {
+          // goods.cart_num = Number(goods.cart_num) - 1
+          // this.cartTotalCount = Number(this.cartTotalCount) - 1;
+          if (false == status) {
+            changeCartNum(goods.cart_id, {
+              cart_num: Number(goods.cart_num) - 1
+            }).then(res => {
+              goods.numSub = false;
+              goods.numAdd = false;
+              if (goods.cart_num <= 1) {
+                goods.numSub = true;
+              }
+              goods.cart_num = Number(goods.cart_num) - 1
+              // this.cartTotalCount = Number(this.cartTotalCount) - 1;
+              this.cartAllCheck('goodsCheck')
+            }).catch(error => {
+              this.$util.Tips({
+                title: error
+              });
+            })
+          }
+        }
+      },
+      getCartNum: function() {
+        let that = this;
+        getCartCounts({ 
+          product_type: 98,
+          source: this.source
+        }).then(res => {
+          // console.log(res);
+          that.cartTotalCount = res.data[0].count || 0;
+        });
+      },
+      // 购物车列表
+      getCartList: function(isChange) {
+        let that = this;
+        getCartList({ 
+          product_type: 98,
+          source: this.source
+        }).then(res => {
+          this.type_id=res.data?.list[0]?.type_id||[]
+          res.data.list.forEach((item, index) => {
+            item.allCheck = true
+            item.list.forEach((goods, j) => {
+              goods.check = true
+              if (goods.cart_num == 1) {
+                goods.numSub = true;
+              } else {
+                goods.numSub = false;
+              }
+              if (goods.cart_num == goods.productAttr.stock) {
+                goods.numAdd = true;
+              } else {
+                goods.numAdd = false;
+              }
+            })
+          })
+          this.cartList.valid = res.data.list
+          this.cartList.invalid = res.data.fail
+          if (res.data.list.length == 0 && res.data.list.length == 0) {
+            this.recommend = true;
+            if (!this.hostProduct.length) {
+              this.getHostProduct();
+            }
+          } else {
+            this.recommend = false
+          }
+          const sku = {}
+          // this.checkboxAllChange()
+          this.cartAllCheck('cartCheck');
+        });
+      },
+      // 商铺全选
+      storeAllCheck(item, index) {
+        // 店铺取消
+        if (item.allCheck) {
+          item.allCheck = false
+          item.list.forEach((el, index) => {
+            el.check = false
+          })
+        } else {
+          item.allCheck = true
+          item.list.forEach((el, index) => {
+            el.check = true
+          })
+        }
+        this.cartAllCheck('goodsCheck')
+      },
+      // 商品选中
+      goodsCheck(goods) {
+        goods.check = !goods.check
+        // console.log(parentIndex,'parentIndex')
+        this.cartAllCheck('goodsCheck')
+      },
+      // 全选判断
+      cartAllCheck(type) {
+        let allArr = [];
+        let totalMoney = 0
+        let totalNum = 0
+        this.cartList.valid.forEach((el, index) => {
+          if (type == 'goodsCheck') {
+            let tempArr = el.list.filter(goods => {
+              return goods.check == true
+            })
+            if (el.list.length == tempArr.length) {
+              el.allCheck = true
+              allArr.push(el)
+            } else {
+              el.allCheck = false
+            }
+          } else {
+            el.list.forEach((goods) => {
+              goods.check = this.isAllSelect
+            })
+            el.allCheck = this.isAllSelect
+            if (el.allCheck) allArr.push(el)
+          }
+          // 总金额 //总数
+          el.list.forEach(e => {
+            if (e.check) {
+              totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.procure_price, e.cart_num))
+              totalNum += e.cart_num
+            }
+          })
+        })
+        this.cartCount = totalNum
+        this.selectCountPrice = totalMoney
+        // 全选
+        this.isAllSelect = allArr.length == this.cartList.valid.length ? true : false
+      },
+      // 购物车全选
+      checkboxAllChange() {
+        this.isAllSelect = !this.isAllSelect
+        this.cartAllCheck('cartCheck')
+      },
+      // 推荐列表
+      getHostProduct: function() {
+        let that = this;
+        if (that.loadend) return;
+        if (that.hotScroll) return;
+        that.loading = true;
+        that.loadTitle = "加载更多";
+        getProductHot(
+          that.hotPage,
+          that.hotLimit,
+        ).then(res => {
+          let list = res.data.list || [];
+          that.hotPage++
+          that.hotScroll = res.data.list.length < that.hotLimit
+          that.hostProduct = that.hostProduct.concat(res.data.list)
+          that.loading = false;
+          that.loadTitle = that.hotScroll ? "我也是有底线的" : '加载更多';
+        });
+      },
+      // 失效商品展开
+      goodsOpen: function() {
+        let that = this;
+        that.goodsHidden = !that.goodsHidden;
+      },
+      // 管理
+      manage: function() {
+        let that = this;
+        that.footerswitch = !that.footerswitch;
+      },
+      // 清空
+      unsetCart: function() {
+        let that = this,
+          ids = [];
+        for (let i = 0, len = that.cartList.invalid.length; i < len; i++) {
+          ids.push(that.cartList.invalid[i].cart_id);
+        }
+        cartDel({
+          cart_id: ids
+        }).then(res => {
+          that.$util.Tips({
+            title: '清除成功'
+          });
+          that.getCartNum();
+          that.$set(that.cartList, 'invalid', []);
+        }).catch(res => {
+
+        });
+      },
+      // 店铺优惠券
+      giveCoupon(item) {
+        let that = this;
+        let goodsArr = []
+        let couponList = [];
+        let activeList = [];
+        let ids = []
+        item.list.map(el => {
+          ids.push(el.product_id)
+        })
+        uni.showLoading({
+          title: '加载中...',
+          mask: true
+        });
+        getCoupons({
+          ids: ids.join(',')
+        }).then(res => {
+          goodsArr = res.data
+          getShopCoupons(item.mer_id).then(({ data }) => {
+            uni.hideLoading();
+            couponList = goodsArr.concat(data)
+            this.$set(this.coupon, 'list', couponList);
+            this.$set(this.coupon, 'coupon', true);
+          }).catch(error => {})
+        });
+      },
+      ChangCouponsClone: function() {
+        this.$set(this.coupon, 'coupon', false)
+      },
+      ChangCouponsUseState(index) {
+        let that = this;
+        that.coupon.list[index].issue = true;
+        // console.log(that.coupon.list[index])
+      },
+    },
+    onReachBottom() {
+      this.recommend && this.getHostProduct();
+    },
+    // 滚动监听
+    onPageScroll(e) {
+      // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+      uni.$emit('scroll');
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .shoppingCart .labelNav {
+    height: 76rpx;
+    padding: 0 30rpx;
+    font-size: 22rpx;
+    color: #8c8c8c;
+    position: fixed;
+    left: 0;
+    width: 100%;
+    box-sizing: border-box;
+    background-color: #f5f5f5;
+    z-index: 5;
+    top: 0;
+  }
+
+  .icon-xiala1 {
+    display: inline-block;
+    transform: rotate(180deg);
+    font-size: 14rpx;
+    padding: 0 5rpx;
+  }
+
+  .shoppingCart .labelNav .item .iconfont {
+    font-size: 25rpx;
+    margin-right: 10rpx;
+  }
+
+  .t-color {
+    color: var(--view-theme);
+  }
+
+  .shoppingCart {
+    /* #ifndef MP */
+    padding-bottom: 180rpx;
+    /* #endif */
+    /* #ifdef MP */
+    padding-bottom: calc(0rpx+ constant(safe-area-inset-bottom));
+    padding-bottom: calc(0rpx + env(safe-area-inset-bottom));
+
+    /* #endif */
+    &.showFoot {
+      padding-bottom: calc(180rpx+ constant(safe-area-inset-bottom));
+      padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
+    }
+
+  }
+
+  .shoppingCart .nav {
+    width: 100%;
+    height: 80rpx;
+    background-color: #fff;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    font-size: 28rpx;
+    color: #282828;
+    position: fixed;
+    left: 0;
+    z-index: 5;
+    top: 76rpx;
+  }
+
+  .shoppingCart .nav .administrate {
+    font-size: 26rpx;
+    color: #282828;
+    width: 110rpx;
+    height: 46rpx;
+    border-radius: 6rpx;
+    border: 1px solid #868686;
+  }
+
+  .shoppingCart .noCart {
+    margin-top: 20rpx;
+    margin-bottom: 20rpx;
+    background-color: #fff;
+    padding-top: 0.1rpx;
+  }
+
+  .shoppingCart .noCart .pictrue {
+    text-align: center;
+    margin: 78rpx auto 56rpx auto;
+    padding-bottom: 60rpx;
+  }
+
+  .shoppingCart .noCart .pictrue image {
+    width: 414rpx;
+    height: 305rpx;
+  }
+
+  .shoppingCart .noCart .pictrue view {
+    color: #999;
+  }
+
+  .shoppingCart .list {
+    margin: 171rpx 0 20rpx;
+  }
+
+  .shoppingCart .list .item {
+    background-color: #fff;
+    margin-bottom: 15rpx;
+
+    .store-title {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      padding: 15rpx 30rpx;
+      min-height: 85rpx;
+      border-bottom: 1px solid #f0f0f0;
+
+      .checkbox {
+        width: 60rpx;
+
+        .iconfont {
+          font-size: 40rpx;
+          color: #CCCCCC;
+        }
+
+        .icon-xuanzhong1 {
+          color: var(--view-theme);
+        }
+      }
+
+      .info {
+        flex: 1;
+        display: flex;
+        align-items: center;
+
+        .iconfont {
+          font-size: 36rpx;
+        }
+
+        .name {
+          margin: 0 0 0 10rpx;
+          font-size: 28rpx;
+          color: #282828;
+          font-weight: bold;
+        }
+
+        .icon-xiangyou {
+          margin-top: 6rpx;
+          font-size: 22rpx;
+          color: #999;
+        }
+      }
+
+      .coupon-btn {
+        color: var(--view-theme);
+        font-size: 22rpx;
+        width: 100rpx;
+        line-height: 36rpx;
+        background: var(--view-minorColor);
+        border-radius: 18rpx;
+        text-align: center;
+      }
+    }
+  }
+
+  .vipImg {
+    width: 65rpx;
+    height: 28rpx;
+    margin-left: 10rpx;
+
+    image {
+      width: 100%;
+      height: 100%;
+      display: block;
+    }
+  }
+
+  .shoppingCart .list .item .picTxt {
+    width: 100%;
+    padding: 25rpx 30rpx;
+    position: relative;
+    align-items: center;
+    border-bottom: 1px solid #f0f0f0;
+
+    .checkbox {
+      width: 60rpx;
+
+      .iconfont {
+        font-size: 40rpx;
+        color: #CCCCCC;
+      }
+
+      .icon-xuanzhong1 {
+        color: var(--view-theme);
+      }
+    }
+  }
+
+  .shoppingCart .list .item .picTxt .pictrue {
+    width: 160rpx;
+    height: 160rpx;
+  }
+
+  .shoppingCart .list .item .picTxt .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 6rpx;
+  }
+
+  .shoppingCart .list .item .picTxt .text {
+    width: 444rpx;
+    margin-left: 20rpx;
+    font-size: 28rpx;
+    color: #282828;
+  }
+
+  .shoppingCart .list .item .picTxt .buy_limit {
+    margin-top: 10rpx;
+    color: #E93323;
+    font-size: 22rpx;
+  }
+
+  .shoppingCart .list .item .picTxt .text .infor {
+    display: inline-block;
+    padding: 6rpx;
+    border-radius: 4rpx;
+    font-size: 24rpx;
+    color: #868686;
+    margin-top: 16rpx;
+    background-color: #F5F5F5;
+    max-width: 460rpx;
+  }
+
+  .shoppingCart .list .item .picTxt .text .money {
+    font-size: 32rpx;
+    color: #282828;
+    margin-top: 28rpx;
+  }
+
+  .shoppingCart .list .item .picTxt .carnum {
+    height: 47rpx;
+    position: absolute;
+    bottom: 30rpx;
+    right: 30rpx;
+  }
+
+  .shoppingCart .list .item .picTxt .carnum view {
+    border: 1px solid #a4a4a4;
+    min-width: 66rpx;
+    text-align: center;
+    height: 100%;
+    line-height: 46rpx;
+    font-size: 28rpx;
+    color: #a4a4a4;
+  }
+
+  .shoppingCart .list .item .picTxt .carnum .reduce {
+    border-right: 0;
+    border-radius: 3rpx 0 0 3rpx;
+  }
+
+  .shoppingCart .list .item .picTxt .carnum .reduce.on {
+    border-color: #e3e3e3;
+    color: #dedede;
+  }
+
+  .shoppingCart .list .item .picTxt .carnum .plus {
+    border-left: 0;
+    border-radius: 0 3rpx 3rpx 0;
+  }
+
+  .shoppingCart .list .item .picTxt .carnum .num {
+    color: #282828;
+  }
+
+  .list {
+    padding-bottom: 90rpx;
+  }
+
+  .shoppingCart .invalidGoods {
+    background-color: #fff;
+  }
+
+  .shoppingCart .invalidGoods .goodsNav {
+    width: 100%;
+    height: 66rpx;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    font-size: 28rpx;
+    color: #282828;
+  }
+
+  .shoppingCart .invalidGoods .goodsNav .iconfont {
+    color: #424242;
+    font-size: 28rpx;
+    margin-right: 17rpx;
+  }
+
+  .shoppingCart .invalidGoods .goodsNav .del {
+    font-size: 26rpx;
+    color: #999;
+  }
+
+  .shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 {
+    color: #999;
+    font-size: 33rpx;
+    vertical-align: -2rpx;
+    margin-right: 8rpx;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item {
+    padding: 20rpx 30rpx;
+    border-top: 1px solid #f5f5f5;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item .invalid {
+    font-size: 22rpx;
+    color: #fff;
+    width: 70rpx;
+    height: 36rpx;
+    background-color: #aaa;
+    border-radius: 3rpx;
+    text-align: center;
+    line-height: 36rpx;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item .pictrue {
+    width: 140rpx;
+    height: 140rpx;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 6rpx;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item .text {
+    width: 433rpx;
+    font-size: 28rpx;
+    color: #999;
+    height: 140rpx;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item .text .name {
+    width: 100%;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item .text .infor {
+    font-size: 24rpx;
+  }
+
+  .shoppingCart .invalidGoods .goodsList .item .text .end {
+    font-size: 26rpx;
+    color: #bbb;
+  }
+
+  .shoppingCart .footer {
+    z-index: 9;
+    width: 100%;
+    height: 96rpx;
+    background-color: #fafafa;
+    position: fixed;
+    padding: 0 30rpx;
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+    box-sizing: border-box;
+    border-top: 1px solid #eee;
+    bottom: var(--window-bottom, 0);
+    bottom: calc(var(--window-bottom, 0) + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+    bottom: calc(var(--window-bottom, 0) + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+  }
+
+  .shoppingCart .footer.on {
+    // #ifndef H5
+    bottom: 0rpx;
+    // #endif
+  }
+
+  .shoppingCart .footer .checkAll {
+    font-size: 28rpx;
+    color: #282828;
+    margin-left: 16rpx;
+  }
+
+  .shoppingCart .footer .money {
+    font-size: 30rpx;
+  }
+
+  .shoppingCart .footer .placeOrder {
+    color: #fff;
+    font-size: 30rpx;
+    width: 226rpx;
+    height: 70rpx;
+    border-radius: 50rpx;
+    text-align: center;
+    line-height: 70rpx;
+    margin-left: 22rpx;
+    background-color: var(--view-theme);
+  }
+
+  .shoppingCart .footer .button .bnt {
+    font-size: 28rpx;
+    color: #999;
+    border-radius: 50rpx;
+    border: 1px solid #999;
+    width: 160rpx;
+    height: 60rpx;
+    text-align: center;
+    line-height: 60rpx;
+
+    &.bt-color {
+      color: var(--view-theme);
+      border: 1px solid var(--view-theme);
+    }
+  }
+
+  .shoppingCart .footer .button form~form {
+    margin-left: 17rpx;
+  }
+
+  .allcheckbox {
+    display: flex;
+    align-items: center;
+    max-width: 230rpx;
+
+    .iconfont {
+      margin-right: 20rpx;
+      font-size: 40rpx;
+      color: #CCCCCC;
+    }
+
+    .icon-xuanzhong1 {
+      color: var(--view-theme);
+    }
+  }
+
+  .page-footer {
+    position: fixed;
+    bottom: 0;
+    z-index: 30;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    width: 100%;
+    height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+    height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+    box-sizing: border-box;
+    border-top: solid 1px #F3F3F3;
+    background-color: #fff;
+    box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
+    padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
+    padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
+
+    .foot-item {
+      display: flex;
+      width: max-content;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      position: relative;
+
+      .count-num {
+        position: absolute;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 40rpx;
+        height: 40rpx;
+        top: 0rpx;
+        right: -15rpx;
+        color: #fff;
+        font-size: 20rpx;
+        background-color: #FD502F;
+        border-radius: 50%;
+        padding: 4rpx;
+      }
+    }
+
+    .foot-item image {
+      height: 50rpx;
+      width: 50rpx;
+      text-align: center;
+      margin: 0 auto;
+    }
+
+    .foot-item .txt {
+      font-size: 24rpx;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/order_details/indexOther.vue b/pages/order_details/indexOther.vue
new file mode 100644
index 0000000..e2be9bc
--- /dev/null
+++ b/pages/order_details/indexOther.vue
@@ -0,0 +1,1771 @@
+<template>
+	<view :style="viewColor">
+		<view class='order-details'>
+			<!-- 给header上与data上加on为退款订单-->
+			<!--预售-->
+			<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)">
+				<view class='header presell_header'
+					:style="{ 'background-image': `url(${imgUrl}/static/diy/presell_bg${keyColor}.jpg)`}"
+					:class="'header'+keyColor">
+					<view class="presell_payment">
+						<text class="iconfont icon-shijian1"></text>
+						{{ orderInfo.status == 11 ? '交易已关闭' : '待付尾款' }}
+					</view>
+					<view class='data' style="margin-left: 0;">
+						<view class='state'>
+							请在{{orderInfo.orderProduct[0].cart_info.productPresell.final_end_time}}前完成支付,超时订单将自动取消
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<view class='header acea-row row-middle' :class='isGoodsReturn ? "on":""'>
+					<view class='pictrue' v-if="isGoodsReturn==false">
+
+						<image v-if="orderInfo.status != 9&&orderInfo.status !=12"
+							:src="imgUrl+'/static/order_'+(orderInfo.status+2)+'.gif'">
+						</image>
+
+						<image v-else :src="imgUrl+'/static/order_2.gif'"></image>
+					</view>
+					<view class='data' :class='isGoodsReturn ? "on":""'>
+						<view class='state'>
+              <block v-if="orderInfo.order_status == 1 && orderInfo.status == 0  ">待付款</block>
+							<block v-if="orderInfo.order_status == 2  ">待发货</block>
+							<block v-if="orderInfo.status == 9">等待其他人参加拼团</block>
+							<block v-if="orderInfo.order_status == 7">待核销</block>
+							<block v-if="orderInfo.order_status == 3">
+								{{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}}
+							</block>
+							<block v-if="orderInfo.order_status == 4">待评价</block>
+							<block v-if="orderInfo.order_status == 5">已完成</block>
+							<block v-if="orderInfo.status == -1">已为您退款,感谢您的支持</block>
+						</view>
+						<view>{{orderInfo.pay_time}}</view>
+					</view>
+				</view>
+				<block v-if="isGoodsReturn==false">
+					<view class='nav'>
+						<view class='navCon acea-row row-between-wrapper'>
+							<view
+								:class="orderInfo.order_status == 8||orderInfo.order_status == 1||orderInfo.order_status == 9 ? 'on':''">
+								待付款</view>
+							<view
+								:class="(orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2)&&orderInfo.order_status != 1 ? 'on':''"
+								v-if="orderInfo.order_type != 1">待发货</view>
+							<view
+								:class="(orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 7) ? 'on':''"
+								v-if="orderInfo.order_type == 1">待核销</view>
+							<view :class="orderInfo.order_status == 3 ? 'on':''" v-if="orderInfo.order_type != 1">待收货
+							</view>
+							<view :class="orderInfo.order_status == 4 ? 'on':''">待评价</view>
+							<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
+						</view>
+						<view class='progress acea-row row-between-wrapper'>
+						
+							<view
+								v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
+								<view class='iconfont icon-webicon318 t-color'>
+								</view>
+								<view class='iconfont t-color'></view>
+							</view>
+							<view class="" v-else>
+								<view class='iconfont icon-yuandianxiao t-color'>
+								</view>
+								<view class='iconfont t-color'></view>
+							</view>
+
+							<view class='line b-color'></view>
+							<view class='iconfont'
+								:class='((orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2) ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "t-color":"")'>
+							</view>
+							<view class='line'
+								:class='orderInfo.status > 0 && orderInfo.status != 9||orderInfo.order_status == 7 ? "b-color":""'>
+
+							</view>
+							<view class='iconfont'
+								:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status > 1 && orderInfo.status != 9 ? "t-color":"")'
+								v-if="orderInfo.order_type == 0"></view>
+								
+								
+							<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
+								v-if="orderInfo.order_type == 0"></view>
+								
+							<view class='iconfont'
+								:class='(orderInfo.status == 2 && orderInfo.status != 9&& orderInfo.order_status != 8 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "t-color":"")'>
+							</view>
+							
+							<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
+							</view>
+							<view class='iconfont'
+								:class='(orderInfo.status == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 3 && orderInfo.status != 9 ? "t-color":"")'>
+							</view>
+						</view>
+					</view>
+					<view class='line'>
+						<image :src="`${imgUrl}/static/images/line.jpg`"></image>
+					</view>
+				</block>
+			</view>
+			<view>
+				<!-- 配送地址 -->
+				<view class='address' v-if="orderInfo.order_type == 0 && orderInfo.is_virtual != 1">
+					<view class='name'>{{orderInfo.real_name}}
+						<view class='phone'>{{orderInfo.user_phone}}</view>
+					</view>
+					<view>{{orderInfo.user_address}}</view>
+				</view>
+				<!-- 地图 -->
+				<view class="map acea-row row-between-wrapper" v-if="orderInfo.order_type == 1">
+					<view>自提地址信息</view>
+					<view class="place t-color acea-row row-center-wrapper" @tap="showMaoLocation">
+						<text class="iconfont icon-weizhi"></text>查看位置
+					</view>
+				</view>
+				<view class='address' v-if="orderInfo.order_type == 1" style="margin-top: 0;">
+					<view class='name'>
+						{{orderInfo.take.mer_take_name}}
+						<text class='phone' @click="makePhone">{{orderInfo.take.mer_take_phone}}</text>
+						<text class="iconfont icon-tonghua t-color" @click="makePhone"></text>
+					</view>
+					<view class="line2">{{orderInfo.take.mer_take_address}}</view>
+				</view>
+				<view v-if="orderInfo.take" class="take-info">
+					<view class="take-msg">
+						<view class="left">
+							<view class="title">
+								营业时间
+							</view>
+							<view class="text">
+								<text
+									v-if="orderInfo.take.mer_take_day && orderInfo.take.mer_take_day.length == 7">周一至周日：</text>
+								<block v-else>
+									<text v-for="item in orderInfo.take.mer_take_day">{{'周'+ toChinese(item)}},</text>
+								</block>
+								<text class="time"
+									v-if="orderInfo.take.mer_take_time">{{orderInfo.take.mer_take_time[0]}}-{{orderInfo.take.mer_take_time[1]}}</text>
+							</view>
+						</view>
+						<view class="code" @click="showCode">
+							<text class="iconfont icon-hexiaoma"></text>
+							<view class="text">
+								自提码
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="merchant" v-if="orderInfo.merchant && orderInfo.order_type != 1"
+					@click="goStore(orderInfo.mer_id)">
+					{{orderInfo.merchant.mer_name}}
+					<text class="iconfont icon-xiangyou"></text>
+				</view>
+				<block v-if="cartInfo.length>0">
+
+					<orderGoods :orderData='orderInfo' :evaluate='orderInfo.order_status'
+						:activityType='orderInfo.activity_type' :orderId="order_id" :btn="false" :cartInfo="cartInfo" :jump="true" :order_status="orderInfo.order_status">
+					</orderGoods>
+
+					<block
+						v-if="orderInfo.order_type == 1 && orderInfo.takeOrderList && orderInfo.takeOrderList.length > 0"
+						v-for="(item,index) in orderInfo.takeOrderList" :key="index">
+
+						<orderGoods :orderData='item' :evaluate='item.status' :activityType='item.activity_type'
+							:orderId="item.order_id" :cartInfo="item.orderProduct" :btn="false" :jump="true" :order_status="orderInfo.order_status"></orderGoods>
+					</block>
+				</block>
+
+				<div v-if="orderInfo.merchant && orderInfo.merchant.services_type == 1" class="goodCall" @click="call">
+					<text class="iconfont icon-kefu"></text><text style="font-size: 28rpx;">联系客服</text>
+				</div>
+				<div v-else class="goodCall" @click="goGoodCall">
+					<text class="iconfont icon-kefu"></text><text style="font-size: 28rpx;">联系客服</text>
+				</div>
+				<!-- 送货 -->
+				<view class="wrapper" v-if="orderInfo.delivery_type == 2">
+					<view class='item acea-row row-between'>
+						<view>配送方式：</view>
+						<view class='conter'>送货</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>配送员：</view>
+						<view class='conter'>{{orderInfo.delivery_name}}</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>联系电话：</view>
+						<view class='conter'>{{orderInfo.delivery_id}}</view>
+					</view>
+				</view>
+				<!-- 同城配送 -->
+				<view v-if="orderInfo.delivery_type == 5" class="wrapper">
+					<view class='item virtual_item'>
+						<view class="acea-row virtual_row">
+							<view>
+								<image :src="`${imgUrl}/static/images/delivery_man.png`"></image>
+							</view>
+							<view v-if="orderInfo.delivery_id" class="virtual_delivery">
+								<view>{{orderInfo.delivery_name}}</view>
+								<view>{{orderInfo.delivery_id}}</view>
+							</view>
+							<view v-else class="virtual_delivery_not">配送员未接单</view>
+						</view>
+						<navigator class="virtual_detail" hover-class="none"
+							:url="'/pages/order_details/delivery?orderId=' + orderInfo.order_id">查看详情</navigator>
+					</view>
+				</view>
+				<view v-if="orderInfo.remark" class="wrapper">
+					<view class="item acea-row row-between">
+						<view class="">发货备注：</view>
+						<view class="conter remark">{{ orderInfo.remark }}</view>
+					</view>
+				</view>
+
+				<view class='wrapper orderinfo'>
+					<view class='item acea-row row-between'>
+						<view>订单编号：</view>
+						<view class='conter acea-row row-middle row-right'>{{orderInfo.order_sn}}
+							<!-- #ifndef H5 -->
+							<text class='copy' @tap='copy'>复制</text>
+							<!-- #endif -->
+							<!-- #ifdef H5 -->
+							<text class='copy copy-data' :data-clipboard-text="orderInfo.order_sn">复制</text>
+							<!-- #endif -->
+						</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>下单时间：</view>
+						<view class='conter'>{{orderInfo.create_time}}</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>支付状态：</view>
+						<!-- <view class='conter'>已支付</view> -->
+					</view>
+					<view class='item acea-row row-between' v-if="orderInfo.pay_time">
+						<view>支付时间：</view>
+						<view class='conter'>{{orderInfo.pay_time}}</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>商品总额：</view>
+						<view class='conter'>￥{{orderInfo.total_price}}</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>支付方式：</view>
+						<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
+						<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
+						<view class='conter'
+							v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
+						<view class='conter' v-if="orderInfo.pay_type==8 ">先货后款</view>
+					</view>
+					<view class='item acea-row row-between' v-if="orderInfo.mark">
+						<view>买家留言：</view>
+						<view class='conter'>{{orderInfo.mark}}</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="orderInfo.is_virtual == 1 && orderInfo.order_extend" class='wrapper'>
+				<view v-for="(item,index) in orderInfo.order_extend" v-if="item" :key="index"
+					class='item acea-row row-between'>
+					<view>{{index}}：</view>
+					<view v-if="!Array.isArray(item)" class='conter'>{{item}}</view>
+					<view v-else class='conter virtual_image'>
+						<image v-for="(pic,i) in item" :key="i" class="picture" :src="pic"
+							@click="getPhotoClickIdx(item,i)"></image>
+					</view>
+				</view>
+			</view>
+			<view class='wrapper' v-if="false">
+				<view class='item acea-row row-between' v-if="orderInfo.pay_postage > 0 && orderInfo.order_type != 1">
+					<view>运费：</view>
+					<view class='conter'>+￥{{orderInfo.pay_postage}}</view>
+				</view>
+				<view class='item acea-row row-between' v-if='orderInfo.coupon_price > 0'>
+					<view>优惠券抵扣：</view>
+					<view class='conter'>-￥{{orderInfo.coupon_price}}</view>
+				</view>
+				<view class='item acea-row row-between' v-if='orderInfo.integral'>
+					<view>积分抵扣：</view>
+					<view class='conter'>-￥{{orderInfo.integral_price}}</view>
+				</view>
+				<view class='item acea-row row-between' v-if="orderInfo.activity_type == 2">
+					<view>实付款：</view>
+					<view class='conter'>￥{{orderInfo.presell_price}}</view>
+				</view>
+				<view class="settel" v-else>
+					<view class='settel-t'>
+						<view>实付款：</view>
+						<view class='conter'>￥{{orderInfo.pay_price}}</view>
+					</view>
+					<view class="settel-m" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12">
+						结算周期到期后付款 ￥100.00
+						<image src="@/static/images/wenhao.png" mode="" @click="open"></image>
+					</view>
+					<view class="settel-f" v-if="orderInfo.pay_type == 8 && orderInfo.status == 12">
+						结算周期:30天 日利率:0.05%
+					</view>
+				</view>
+			</view>
+			<view class="content-clip"></view>
+			<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false&&false">
+				<!-- <view class='bnt cancel' @click="cancelSales">取消售后</view> -->
+				<!-- <view v-if="!orderInfo.receipt && !isGoodsReturn" class='bnt cancel' @click="applyInvoice">申请开票</view> -->
+				<view v-if="orderInfo.activity_type == 2 && (orderInfo.status == 10 || orderInfo.status == 11)"
+					class=" acea-row row-right row-middle">
+					<view v-if="orderInfo.presellOrder.activeStatus == 0" class='bnt b-color btn_auto'>
+						{{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款
+					</view>
+
+
+					<view v-if="orderInfo.presellOrder.activeStatus == 1" class='bnt b-color' @tap='pay_open()'>立即付款
+					</view>
+					<view v-if="orderInfo.presellOrder.activeStatus == 2" class='bnt cancel' @click="cancelOrder">取消订单
+					</view>
+				</view>
+				<block v-if="orderInfo.status == 0 && orderInfo.order_status!=1">
+					<view class="bnt cancel" @click="allRefund"
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
+				</block>
+				<block v-if="orderInfo.status == 9">
+					<view class="bnt cancel" @click="getCombinationRemove">取消拼团</view>
+				</block>
+				<block v-if="orderInfo.order_status == 9">
+					<view class='bnt cancel' @click="cancelOrder">取消订单
+					</view>
+					<view class='bnt b-color' @tap='pay_opena()'>立即付款
+					</view>
+				</block>
+				<view class='bnt b-color' v-if="orderInfo.activity_type==4 && orderInfo.status==9" @tap='goJoinPink'>
+					查看拼团</view>
+				<block v-if="orderInfo.status == 1">
+					<!-- <view class="bnt cancel" @click="allRefund"
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view> -->
+					<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
+						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
+					</navigator>
+
+					<view class="" v-if="orderInfo.activity_type==98||orderInfo.activity_type==99">
+						<view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">确认收货
+						</view>
+						<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
+						</view>
+					</view>
+
+					<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==0">取件码
+					</view>
+
+
+				</block>
+				<block v-if="orderInfo.status == 2">
+					<view class="bnt cancel" @click="allRefund"
+						v-if="refundNum.length != cartInfo.length && orderInfo.refund_status">批量退款</view>
+					<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
+						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
+					</navigator>
+					<view class='bnt b-color' @click="goOrderConfirm"
+						v-if="orderInfo.activity_type!=1 &&orderInfo.order_status!=8&& orderInfo.activity_type!=2 && orderInfo.activity_type!=3 &&orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
+						再次购买</view>
+
+					<view class='bnt b-color' v-if="orderInfo.order_status==8"
+						@tap='pay_open(orderInfo.pay_price,orderInfo.group_order_id)'>
+						去结算
+					</view>
+
+				</block>
+				<block v-if="orderInfo.status == 3">
+					<view class='bnt cancel' @click="delOrder">删除订单</view>
+					<view class="bnt cancel" @click="allRefund" v-if="orderInfo.orderProduct[0].is_refund != 0">批量退款
+					</view>
+					<view class='bnt b-color' @click="goOrderConfirm"
+						v-if="orderInfo.activity_type!=1 && orderInfo.activity_type!=2 && orderInfo.activity_type!=3 && orderInfo.activity_type!=4 && orderInfo.activity_type!=10">
+						再次购买</view>
+				</block>
+			</view>
+		</view>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<!-- 	<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+			:totalPrice='totalPrice' :order_type='1'></payment>
+		 -->
+
+		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+			:totalPrice='totalPrice'></payment>
+		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+		<!--核销码弹窗-->
+		<uni-popup ref="cancellPoupon" type="bottom">
+			<view class="code-content">
+				<text class="iconfont icon-guanbi5" @click="close"></text>
+				<view class="title">核销码</view>
+				<view class="trip">
+					请将二维码展示给店员 或 提供数字核销码
+				</view>
+				<view class="grayBg">
+					<view class="pictrue">
+						<image :src="codeUrl"></image>
+					</view>
+				</view>
+				<view class="num">{{orderInfo.verify_code}}</view>
+			</view>
+		</uni-popup>
+		<u-popup :show="show" bgColor='transparent' mode='center'>
+			<view class="warp">
+				<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+				<image src="@/static/images/yuqi.png" mode="widthFix"></image>
+			</view>
+			<view class="textp">
+				<span>下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在xx天xx小时后计息。</span>
+				<button class="shouhuobtn" @click="close">知道了</button>
+			</view>
+		</u-popup>
+		<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
+			<view class="warp">
+				<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+				<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
+			</view>
+			<view class="textp">
+				<h3>确认收到货了吗?</h3>
+				<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
+				<button class="shouhuobtn" @click="queding()">
+
+					确认
+				</button>
+				<view class="cle" @click="close">取消</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	let app = getApp();
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		getOrderDetail,
+    getOtherOrderDetail,
+		orderAgain,
+		orderTake,
+		orderDel,
+		unOrderCancel,
+		verifyCode,
+		applyInvoiceApi
+	} from '@/api/order.js';
+	import {
+		postCombinationRemove
+	} from '@/api/activity';
+	import {
+		openOrderRefundSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import payment from '@/components/payment';
+	import orderGoods from "@/components/orderGoods";
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		configMap
+	} from "@/utils";
+	import authorize from '@/components/Authorize';
+	import addInvoicing from '@/components/addInvoicing';
+	import zbCode from '@/components/zb-code/zb-code.vue';
+	export default {
+		components: {
+			payment,
+			orderGoods,
+			authorize,
+			addInvoicing,
+			zbCode
+		},
+		data() {
+			return {
+				order_id: '',
+				evaluate: 0,
+				activityType: 0,
+				cartInfo: [], //购物车产品
+				orderInfo: {
+					system_store: {},
+					_status: {},
+					take: {}
+				}, //订单详情
+				system_store: {},
+				isGoodsReturn: false, //是否为退款订单
+				status: {}, //订单底部按钮状态
+				isClose: false,
+				payMode: [{
+						name: "微信支付",
+						icon: "icon-weixinzhifu",
+						value: 'wechat',
+						title: '微信快捷支付',
+						payStatus: 1
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-zhifubao",
+						value: 'alipay',
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						name: "余额支付",
+						icon: "icon-yuezhifu",
+						value: 'balance',
+						title: '可用余额:',
+						number: 0,
+						payStatus: this.$store.getters.globalData.yue_pay_status
+					}
+				],
+				pay_close: false,
+				pay_order_id: '',
+				totalPrice: '0',
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				refundNum: [], //退款个数临时数据
+				imgUrl: HTTP_REQUEST_URL,
+				codeUrl: '',
+				isTimePay: false,
+				codeShow: false,
+				cid: '1',
+				val: "", // 要生成的二维码值
+				size: 200, // 二维码大小
+				unit: 'upx', // 单位
+				background: '#FFF', // 背景色
+				foreground: '#000', // 前景色
+				pdground: '#32dbc6', // 角标色
+				icon: '', // 二维码图标
+				iconsize: 40, // 二维码图标大小
+				lv: 3, // 二维码容错级别 ， 一般不用设置，默认就行
+				onval: true, // val值变化时自动重新生成二维码
+				loadMake: true, // 组件加载完成后自动生成二维码
+				src: '', // 二维码生成后的图片地址或base64
+				codeSrc: "",
+				wd: 225,
+				hg: 500,
+				invoice: {
+					invoice: false,
+					add: false,
+				},
+				show: false,
+				receivingshow: false
+			};
+		},
+		computed: {
+			...configMap({
+					hide_mer_status: 0,
+					yue_pay_status: 0,
+					alipay_open: 0
+				},
+				mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
+		},
+		filters: {
+			filterDay(val) {
+				if (val) {
+					var reg = /(\d{4})\-(\d{2})\-(\d{2})/;
+					var date = val.replace(reg, "$2月$3日");
+					return date
+				}
+			}
+		},
+		onLoad: function(options) {
+			if (options.order_id) {
+				this.$set(this, 'order_id', options.order_id);
+			}
+		},
+		onShow() {
+			if (this.isLogin) {
+				this.getOrderInfo();
+				this.getUserInfo();
+				this.isPayBalance();
+			} else {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+		},
+		onHide: function() {
+			this.isClose = true;
+		},
+		onReady: function() {
+			// #ifdef H5
+			this.$nextTick(function() {
+				const clipboard = new ClipboardJS(".copy-data");
+				clipboard.on("success", () => {
+					this.$util.Tips({
+						title: '复制成功'
+					});
+				});
+			});
+			// #endif
+		},
+		mounted: function() {},
+		methods: {
+			// 图片预览
+			getPhotoClickIdx(list, idx) {
+				uni.previewImage({
+					current: list[idx], //  传 Number H5端出现不兼容
+					urls: list
+				});
+			},
+			// 判断是否到支付尾款时间
+			isPayBalance() {
+				let that = this;
+				if (that.orderInfo.status === 10) {
+					if (new Date() < new Date(that.orderInfo.presellOrder.final_start_time)) {
+						that.isTimePay = false; //未开始
+					} else if ((new Date() >= new Date(that.orderInfo.presellOrder.final_start_time)) && (new Date() <=
+							new Date(that.orderInfo.presellOrder.final_start_time))) {
+						that.isTimePay = true; //立即支付
+					}
+				}
+			},
+			// 数字转汉字
+			toChinese(num) {
+				let changeNum = ['零', '一', '二', '三', '四', '五', '六', '日', '八', '九'];
+				let unit = ["", "十", "百", "千", "万"];
+				num = parseInt(num);
+				let getWan = (temp) => {
+					let strArr = temp.toString().split("").reverse();
+					let newNum = "";
+					for (var i = 0; i < strArr.length; i++) {
+						newNum = (i == 0 && strArr[i] == 0 ? "" : (i > 0 && strArr[i] == 0 && strArr[i - 1] == 0 ? "" :
+							changeNum[strArr[i]] + (strArr[i] == 0 ? unit[0] : unit[i]))) + newNum;
+					}
+					return newNum;
+				}
+				let overWan = Math.floor(num / 10000);
+				let noWan = num % 10000;
+				if (noWan.toString().length < 4) {
+					noWan = "0" + noWan;
+				}
+				return overWan ? getWan(overWan) + "万" + getWan(noWan) : getWan(num);
+			},
+			// 返回店铺首页
+			goStore(mer_id) {
+				if (this.hide_mer_status != 1) {
+					uni.navigateTo({
+						url: '/pages/store/home/index?id=' + mer_id
+					})
+				}
+			},
+			// 批量退款
+			allRefund() {
+				// #ifdef MP
+				openOrderRefundSubscribe().then(() => {
+					uni.hideLoading();
+					if (this.orderInfo.status == 0 || this.orderInfo.is_virtual == 1) {
+						uni.navigateTo({
+							url: '/pages/users/refund/index?order_id=' + this.order_id +
+								'&refund_type=1&type=2&order_type=' + this.orderInfo.order_type
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/users/refund/select?order_id=' + this.order_id +
+								'&type=2&order_type=' + this.orderInfo.order_type
+						})
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				})
+				// #endif
+				// #ifdef H5 || APP-PLUS
+				if (this.orderInfo.status == 0 || this.orderInfo.is_virtual == 1) {
+					uni.navigateTo({
+						url: '/pages/users/refund/index?order_id=' + this.order_id +
+							'&refund_type=1&type=2&order_type=' + this.orderInfo.order_type
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/users/refund/select?order_id=' + this.order_id + '&type=2&order_type=' + this
+							.orderInfo.order_type
+					})
+				}
+				// #endif
+			},
+			//拼团取消
+			getCombinationRemove: function() {
+				var that = this;
+				postCombinationRemove({
+						group_buying_id: that.orderInfo.orderProduct[0].activity_id
+					})
+					.then(res => {
+						that.$util.Tips({
+							title: res.message
+						}, {
+							tab: 3
+						});
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res.message
+						});
+					});
+			},
+			// 取消售后
+			cancelSales() {
+				let that = this;
+				uni.showModal({
+					content: '确定要取消售后？',
+					success: function(res) {
+						if (res.confirm) {
+							deletePlantApi(that.id).then(res => {
+								if (res.status === 200) {
+									that.$util.Tips({
+										title: res.message
+									});
+								}
+							})
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			// 联系客服
+			goGoodCall() {
+				let self = this
+				uni.navigateTo({
+					url: `/pages/chat/customer_list/chat?mer_id=${self.orderInfo.mer_id}&uid=${this.uid}&order_id=${this.order_id}`
+				})
+			},
+			openSubcribe: function(e) {
+				let page = e;
+				uni.showLoading({
+					title: '正在加载',
+				})
+				openOrderRefundSubscribe().then(res => {
+					uni.hideLoading();
+					uni.navigateTo({
+						url: page,
+					});
+				}).catch(() => {
+					uni.hideLoading();
+				});
+			},
+			/**
+			 * 事件回调
+			 *
+			 */
+			onChangeFun: function(e) {
+				let opt = e;
+				let action = opt.action || null;
+				let value = opt.value != undefined ? opt.value : null;
+				(action && this[action]) && this[action](value);
+			},
+			/**
+			 * 拨打电话
+			 */
+			makePhone: function() {
+				uni.makePhoneCall({
+					phoneNumber: this.orderInfo.take.mer_take_phone
+				})
+			},
+			/**
+			 * 拨打电话
+			 */
+			call: function() {
+				uni.makePhoneCall({
+					phoneNumber: this.orderInfo.merchant.service_phone
+				})
+			},
+			/**
+			 * 打开地图
+			 *
+			 */
+			showMaoLocation: function() {
+				if (!this.orderInfo.take.mer_take_location[0] || !this.orderInfo.take.mer_take_location[1]) return this
+					.$util.Tips({
+						title: '请设置允许商城访问您的位置！'
+					});
+				let that = this,
+					lat = parseFloat(that.orderInfo.take.mer_take_location[0]),
+					long = parseFloat(that.orderInfo.take.mer_take_location[1])
+				//#ifdef H5
+				if (that.$wechat.isWeixin() === true) {
+					that.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						address: that.orderInfo.take ? that.orderInfo.take.mer_take_name : ''
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: lat,
+						longitude: long,
+						address: that.orderInfo.take ? that.orderInfo.take.mer_take_name : '',
+						scale: 8,
+						success: function() {},
+					});
+					// #ifdef H5
+				}
+				//#endif
+			},
+			/**
+			 * 关闭支付组件
+			 *
+			 */
+			payClose: function() {
+				this.pay_close = false;
+			},
+			/**
+			 * 打开支付组件
+			 *
+			 */
+			pay_opena() {
+
+				uni.showModal({
+					title: '提示',
+					title: '该订单属于先货后款的订单，等商户确认后才能支付',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			pay_open: function(pay_price, order_id) {
+
+				this.pay_close = true;
+				this.pay_order_id = this.orderInfo.order_id.toString();
+				this.totalPrice = this.orderInfo.pay_price;
+				// this.$set(this, 'pay_close', true);
+				// this.order_id = order_id;
+				// this.pay_order_id = order_id.toString()
+				// this.$set(this, 'totalPrice', pay_price);
+			},
+			/**
+			 * 支付成功回调
+			 *
+			 */
+			pay_complete: function() {
+				this.pay_close = false;
+				this.pay_order_id = '';
+				this.getOrderInfo();
+			},
+			/**
+			 * 支付失败回调
+			 *
+			 */
+			pay_fail: function() {
+				this.pay_close = false;
+				this.pay_order_id = '';
+			},
+			/**
+			 * 登录授权回调
+			 *
+			 */
+			onLoadFun: function() {
+				this.isShowAuth = false;
+				this.getOrderInfo();
+				this.getUserInfo();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			/**
+			 * 获取用户信息
+			 *
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.payMode[2].number = res.data.now_money;
+				})
+			},
+			getOrderCode() {
+				verifyCode(this.order_id).then(res => {
+					this.codeUrl = res.data.qrcode
+					this.val = res.data.qrcode
+				})
+			},
+			/**
+			 * 获取订单详细信息
+			 *
+			 */
+			getOrderInfo: function() {
+				let that = this;
+				uni.showLoading({
+					title: "正在加载中"
+				});
+				getOtherOrderDetail(that.order_id).then(res => {
+					uni.hideLoading();
+
+					that.$set(that, 'orderInfo', res.data);
+					that.orderInfo.take = res.data.take;
+					that.$set(that, 'cartInfo', res.data.orderProduct);
+					if (that.orderInfo.status == '-1') {
+						that.isGoodsReturn = true;
+					}
+					res.data.orderProduct.map(el => {
+						if (el.refund_num == 0) {
+							that.refundNum.push(el)
+						}
+					})
+					if (res.data.order_type == 1) {
+						that.getOrderCode()
+					}
+				}).catch(err => {
+					uni.hideLoading();
+					that.$util.Tips({
+						title: err
+					}, '/pages/users/order_list/index');
+				});
+			},
+			qrR(res) {
+				this.codeSrc = res
+			},
+			showCode() {
+				this.$refs.cancellPoupon.open();
+			},
+			close() {
+				this.$refs.cancellPoupon.close();
+			},
+			/**
+			 *
+			 * 剪切订单号
+			 */
+			// #ifndef H5
+			copy: function() {
+				let that = this;
+				// console.log(that.orderInfo.order_sn)
+				uni.setClipboardData({
+					data: that.orderInfo.order_sn,
+					success: function(res) {}
+
+				});
+			},
+			// #endif
+			/**
+			 * 打电话
+			 */
+			goTel: function() {
+				uni.makePhoneCall({
+					phoneNumber: this.orderInfo.delivery_id
+				})
+			},
+			/**
+			 * 去拼团详情
+			 *
+			 */
+			goJoinPink: function() {
+				uni.navigateTo({
+					url: '/pages/activity/combination_status/index?id=' + this.orderInfo.orderProduct[0]
+						.activity_id,
+				});
+			},
+			/**
+			 * 再此购买
+			 *
+			 */
+			goOrderConfirm: function() {
+				let that = this;
+				let data = []
+				this.cartInfo.map((item, index) => {
+					let obj = {}
+					obj.product_id = item.product_id
+					obj.product_attr_unique = item.product_sku
+					obj.cart_num = item.product_num
+					data.push(obj)
+				})
+
+				orderAgain({
+					data: data
+				}).then(res => {
+					let cart_id = res.data.cart_id.join(',')
+					return uni.navigateTo({
+						url: '/pages/users/order_confirm/index?cartId=' + cart_id
+					});
+				});
+			},
+			//收货弹窗
+			confirmOrdera: function(item) {
+				this.receivingshow = true
+
+			},
+			confirmOrderb: function(item) {
+				let that = this;
+				uni.showModal({
+					title: '确认收货',
+					content: '为保障权益，请收到货确认无误后，再确认收货',
+					success: function(res) {
+						if (res.confirm) {
+							orderTake(item.order_id).then(res => {
+								return that.$util.Tips({
+									title: '操作成功',
+									icon: 'success'
+								}, function() {
+									that.orderList.splice(index, 1);
+									that.getOrderData();
+								});
+							}).catch(err => {
+								return that.$util.Tips({
+									title: err
+								});
+							})
+						}
+					}
+				})
+			},
+			confirmOrder: function(item) {
+				uni.showModal({
+					title: '取件码',
+					content: item.logistics_code,
+					success: function(res) {
+						if (res.confirm) {
+							// console.log('用户点击确定');
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				})
+
+			},
+			queding() {
+
+				let that = this;
+				orderTake(that.order_id).then(res => {
+					this.receivingshow = false
+					that.getOrderInfo();
+					return that.$util.Tips({
+						title: '成功收货',
+						icon: 'success'
+					}, function() {
+
+
+					});
+				}).catch(err => {
+					this.receivingshow = false
+					return that.$util.Tips({
+						title: err
+					});
+				})
+
+
+
+			},
+			/**
+			 *
+			 * 删除订单
+			 */
+			delOrder: function() {
+				let that = this;
+				orderDel(this.order_id).then(res => {
+					return that.$util.Tips({
+						title: '删除成功',
+						icon: 'success'
+					}, {
+						tab: 3,
+						url: 1
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			cancelOrder() {
+				let self = this
+				uni.showModal({
+					title: '提示',
+					content: '确认取消该订单?',
+					success: function(res) {
+						if (res.confirm) {
+							orderDel(self.orderInfo.order_id)
+								.then((data) => {
+									// console.log(data)
+									self.$util.Tips({
+										title: data.msg
+									}, {
+										tab: 3
+									})
+								})
+								.catch((err) => {
+									return self.$util.Tips({
+										title: err
+									});
+								});
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			/*申请开票*/
+			applyInvoice() {
+				let that = this;
+				that.invoice.invoice = true;
+				that.$refs.addInvoicing.getInvoiceDefault();
+				that.$refs.addInvoicing.getInvoiceList();
+			},
+			// 关闭发票弹窗
+			changeInvoiceClose: function(data) {
+				if (data) this.getInvoiceData(data);
+				this.$set(this.invoice, 'invoice', false);
+			},
+			// 开票回调
+			getInvoiceData(data) {
+				let that = this
+				applyInvoiceApi(that.order_id, data).then(res => {
+					return that.$util.Tips({
+						title: res.message,
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			close() {
+				this.show = false
+				this.receivingshow = false
+			},
+			open() {
+				this.show = true
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.remark {
+		flex: 1;
+	}
+
+	.merchant {
+		width: 100%;
+		height: 86rpx;
+		padding: 0 30rpx;
+		margin-top: 15rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+		font-size: 30rpx;
+		color: #282828;
+		line-height: 86rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+
+		.iconfont {
+			margin-top: 6rpx;
+			font-size: 22rpx;
+		}
+	}
+
+	.presell_bg_header {
+		background: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+	}
+
+	.b-color {
+		background-color: var(--view-theme);
+	}
+
+	.t-color {
+		color: var(--view-theme) !important;
+	}
+
+	.goodCall {
+		text-align: center;
+		width: 100%;
+		height: 86rpx;
+		padding: 0 30rpx;
+		border-bottom: 1px solid #eee;
+		font-size: 30rpx;
+		line-height: 86rpx;
+		background: #fff;
+		color: #282828;
+
+		.icon-kefu {
+			font-size: 28rpx;
+			margin-right: 15rpx;
+		}
+
+		/* #ifdef MP */
+		button {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 86rpx;
+			font-size: 30rpx;
+			color: #e93323;
+		}
+
+		/* #endif */
+	}
+
+	.order-details .header {
+		padding: 0 30rpx;
+		height: 150rpx;
+		background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+
+		&.presell_header {
+			background-repeat: no-repeat;
+			background-size: cover;
+			padding: 35rpx 50rpx;
+
+			.data {
+				margin: 8rpx 0 0 13rpx;
+
+				.state {
+					font-weight: normal;
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+
+	.take-info {
+		padding: 0 30rpx 30rpx;
+		background-color: #ffffff;
+		margin-bottom: 14rpx;
+	}
+
+	.take-msg {
+		display: flex;
+		justify-content: space-between;
+		background-color: #FAFAFA;
+		padding: 24rpx;
+		border-radius: 4rpx;
+
+		.left {
+			font-size: 24rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+
+			.title {
+				font-size: 28rpx;
+				font-weight: bold;
+				color: #282828;
+			}
+
+			.text {
+				color: #666666;
+			}
+		}
+
+		.code {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+
+			.iconfont {
+				font-size: 50rpx;
+				color: #666666;
+			}
+
+			.text {
+				font-size: 20rpx;
+				color: #666666;
+				margin-top: 12rpx;
+			}
+		}
+	}
+
+	.order-details .header.on {
+		background-color: #666 !important;
+	}
+
+	.order-details .header .pictrue {
+		width: 110rpx;
+		height: 110rpx;
+	}
+
+	.order-details .header .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.order-details .header .data {
+		color: rgba(255, 255, 255, 0.8);
+		font-size: 24rpx;
+		margin-left: 27rpx;
+	}
+
+	.order-details .header .data.on {
+		margin-left: 0;
+	}
+
+	.order-details .header .data .state {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #fff;
+		margin-bottom: 7rpx;
+	}
+
+	.presell_header .presell_payment {
+		color: #fff;
+		font-size: 30rpx;
+		font-weight: bold;
+
+		.iconfont {
+			font-weight: normal;
+			margin-right: 8rpx;
+		}
+	}
+
+	.order-details .header .data .time {
+		margin-left: 20rpx;
+	}
+
+	.order-details .nav {
+		background-color: #fff;
+		font-size: 26rpx;
+		color: #282828;
+		padding: 25rpx 0;
+	}
+
+	.order-details .nav .navCon {
+		padding: 0 40rpx;
+	}
+
+	.order-details .nav .on {
+		color: var(--view-theme);
+	}
+
+	.order-details .nav .progress {
+		padding: 0 65rpx;
+		margin-top: 10rpx;
+	}
+
+	.order-details .nav .progress .line {
+		width: 100rpx;
+		height: 2rpx;
+		background-color: #939390;
+	}
+
+	.order-details .nav .progress .iconfont {
+		font-size: 25rpx;
+		color: #939390;
+		margin-top: -2rpx;
+	}
+
+	.order-details .address {
+		font-size: 26rpx;
+		color: #868686;
+		background-color: #fff;
+		margin-top: 13rpx;
+		padding: 35rpx 30rpx;
+	}
+
+	.order-details .address .name {
+		font-size: 30rpx;
+		color: #282828;
+		margin-bottom: 15rpx;
+	}
+
+	.order-details .line {
+		width: 100%;
+		height: 3rpx;
+	}
+
+	.order-details .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-details .wrapper {
+		background: #FFFFFF;
+		border-radius: 21rpx 21rpx 21rpx 21rpx;
+		margin-top: 12rpx;
+		padding: 30rpx;
+	}
+
+	.order-details .wrapper .item {
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.order-details .wrapper .virtual_item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.order-details .virtual_item .virtual_row {
+		width: 300rpx;
+		align-items: center;
+		justify-content: space-between;
+
+		image,
+		uni-image {
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 100%;
+		}
+	}
+
+	.order-details .virtual_item .virtual_detail {
+		color: var(--view-theme);
+	}
+
+	.order-details .virtual_item .virtual_delivery {
+		line-height: 40rpx;
+	}
+
+	.order-details .virtual_item .virtual_delivery_not {
+		font-weight: bold;
+	}
+
+	.order-details .wrapper .item~.item {
+		margin-top: 20rpx;
+	}
+
+	.order-details .wrapper .item .conter {
+		color: #868686;
+		text-align: right;
+	}
+
+	.order-details .wrapper .item .virtual_image {
+		// text-align: left;
+		margin-left: 50rpx;
+	}
+
+	.order-details .wrapper .item .virtual_image .picture {
+		width: 106rpx;
+		height: 106rpx;
+		border-radius: 8rpx;
+		margin-right: 10rpx;
+
+		&:last-child {
+			margin-right: 0;
+		}
+	}
+
+	.order-details .wrapper .item .conter .copy {
+		font-size: 20rpx;
+		color: #333;
+		border-radius: 17rpx;
+		border: 1px solid #666;
+		padding: 3rpx 15rpx;
+		margin-left: 24rpx;
+	}
+
+	.order-details .wrapper .actualPay {
+		border-top: 1px solid #eee;
+		margin-top: 30rpx;
+		padding-top: 30rpx;
+	}
+
+	.order-details .wrapper .actualPay .money {
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+
+	.order-details .footer {
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		padding: 0 30rpx;
+		height: 100rpx;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		box-sizing: border-box;
+	}
+
+	.content-clip {
+		height: 120rpx;
+		height: calc(120rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(120rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	}
+
+	.order-details .footer .bnt {
+		width: 156rpx;
+		text-align: center;
+		height: 60rpx;
+		border-radius: 50rpx;
+		color: #fff;
+		font-size: 27rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		&.btn_auto {
+			width: auto;
+			padding: 0 40rpx;
+		}
+	}
+
+	.order-details .footer .bnt.cancel {
+		color: #aaa;
+		border: 1px solid #ddd;
+	}
+
+	.order-details .footer .bnt~.bnt {
+		margin-left: 18rpx;
+	}
+
+	.order-details .writeOff {
+		background-color: #fff;
+		margin-top: 13rpx;
+		padding-bottom: 30rpx;
+	}
+
+	.order-details .writeOff .title {
+		font-size: 30rpx;
+		color: #282828;
+		height: 87rpx;
+		border-bottom: 1px solid #f0f0f0;
+		padding: 0 30rpx;
+		line-height: 87rpx;
+	}
+
+	.grayBg .pictrue {
+		width: 290rpx;
+		height: 290rpx;
+		margin: 0 auto;
+	}
+
+	.grayBg .pictrue image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.gear {
+		width: 590rpx;
+		height: 30rpx;
+		margin: 0 auto;
+	}
+
+	.gear image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.num {
+		color: #282828;
+		font-size: 34rpx;
+		font-weight: bold;
+		margin: 0 auto;
+		text-align: center;
+		margin-top: 30rpx;
+	}
+
+	.order-details .writeOff .rules {
+		margin: 46rpx 30rpx 0 30rpx;
+		border-top: 1px solid #f0f0f0;
+		padding-top: 10rpx;
+	}
+
+	.order-details .writeOff .rules .item {
+		margin-top: 20rpx;
+	}
+
+	.order-details .writeOff .rules .item .rulesTitle {
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.order-details .writeOff .rules .item .rulesTitle .iconfont {
+		font-size: 30rpx;
+		color: #333;
+		margin-right: 8rpx;
+		margin-top: 5rpx;
+	}
+
+	.order-details .writeOff .rules .item .info {
+		font-size: 28rpx;
+		color: #999;
+		margin-top: 7rpx;
+	}
+
+	.order-details .writeOff .rules .item .info .time {
+		margin-left: 20rpx;
+	}
+
+	.order-details .map {
+		height: 86rpx;
+		font-size: 30rpx;
+		color: #282828;
+		line-height: 86rpx;
+		border-bottom: 1px solid #f0f0f0;
+		margin-top: 13rpx;
+		background-color: #fff;
+		padding: 0 30rpx;
+	}
+
+	.order-details .map .place {
+		font-size: 26rpx;
+		width: 176rpx;
+		border-radius: 25rpx;
+		line-height: 50rpx;
+		text-align: center;
+		border: 1px solid var(--view-theme);
+	}
+
+	.order-details .map .place .iconfont {
+		font-size: 27rpx;
+		height: 27rpx;
+		line-height: 27rpx;
+		margin: 2rpx 3rpx 0 0;
+	}
+
+	.order-details .address .name .iconfont {
+		font-size: 34rpx;
+		margin-left: 10rpx;
+	}
+
+	.refund {
+		padding: 0 30rpx 30rpx;
+		margin-top: 24rpx;
+		background-color: #fff;
+
+		.title {
+			display: flex;
+			align-items: center;
+			font-size: 30rpx;
+			color: #333;
+			height: 86rpx;
+			border-bottom: 1px solid #f5f5f5;
+
+			image {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.con {
+			padding-top: 25rpx;
+			font-size: 28rpx;
+			color: #868686;
+		}
+	}
+
+	.qs-btn {
+		width: auto;
+		height: 60rpx;
+		text-align: center;
+		line-height: 60rpx;
+		border-radius: 50rpx;
+		color: #fff;
+		font-size: 27rpx;
+		padding: 0 3%;
+		color: #aaa;
+		border: 1px solid #ddd;
+		margin-right: 20rpx;
+	}
+
+	.code-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 32rpx 0 60rpx 0;
+		background: #ffffff;
+		border-radius: 16rpx 16rpx 0 0;
+		position: relative;
+
+		.iconfont {
+			font-size: 24rpx;
+			color: #939393;
+			position: absolute;
+			top: 20rpx;
+			right: 30rpx;
+		}
+
+		.title {
+			color: #282828;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+
+		.trip {
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #666666;
+			margin: 40rpx 0;
+		}
+	}
+
+	.settel {
+		height: 70px;
+
+		.settel-t {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.settel-m {
+			margin: 5px 0 5px 0px;
+			display: flex;
+			justify-content: flex-end;
+
+			image {
+				width: 20px;
+				height: 20px;
+				margin-left: 5px;
+			}
+		}
+
+		.settel-f {
+			display: flex;
+			justify-content: flex-end;
+		}
+	}
+
+	.warp {
+		margin: auto;
+
+		.guanbi {
+			position: absolute;
+			right: 0px;
+			top: 120rpx;
+			z-index: 1;
+			width: 30px;
+			height: 30px;
+		}
+	}
+
+	.textp {
+		width: 320px;
+		padding-bottom: 20px;
+		position: absolute;
+		top: 110px;
+		border-radius: 10px;
+
+		span {
+			display: block;
+			width: 280px;
+			padding-top: 20px;
+			margin: auto;
+		}
+
+		h3 {
+			text-align: center;
+		}
+
+		.shouhuobtn {
+			margin: auto;
+			line-height: 54px;
+			margin-top: 30px;
+			width: 191px;
+			height: 54px;
+			color: white;
+			background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+			border-radius: 27px 27px 27px 27px;
+		}
+
+		.cle {
+			margin: auto;
+			text-align: center;
+			margin-top: 15px;
+			height: 40px;
+			background-color: #FFFFFF;
+			border-radius: 10px;
+			color: #999999;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/order_confirm/indexOther.vue b/pages/users/order_confirm/indexOther.vue
new file mode 100644
index 0000000..87f4425
--- /dev/null
+++ b/pages/users/order_confirm/indexOther.vue
@@ -0,0 +1,2606 @@
+<template>
+	<view :style="viewColor">
+		<view class='order-submission'>
+			<view v-if="allow_address && order_model == 0" class="allAddress" @click="onAddress">
+				<view class='address acea-row row-between-wrapper' v-if='shippingType == 0 '>
+					<view class='addressCon' v-if="addressInfo.real_name">
+						<view class='name'>{{addressInfo.real_name}}
+							<text class='phone'>{{addressInfo.phone}}</text>
+						</view>
+						<view>
+						
+							<text class='default t-color'
+								v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}
+						 <text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
+						</view>
+					</view>
+					<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
+						class='addressCon'>
+						<view class='setaddress'>设置收货地址</view>
+					</navigator>
+					<view class='iconfont icon-jiantou'></view>
+				</view>
+				<view class='line'>
+					<image :src="`${domain}/static/images/line.jpg`"></image>
+				</view>
+			</view>
+			<!-- 商品信息 -->
+			<view class="storeinfo-wrapper">
+				<view class="store-item" v-for="(item,index) in cartInfo" :key="index">
+					<view class="store-title">
+						<text class="iconfont icon-shangjiadingdan"></text>
+						<view class="txt" @click="goStore(item.mer_id)">{{item.mer_name}}</view>
+						<text class="iconfont icon-xiangyou"></text>
+					</view>
+					<view v-for="(goods,j) in item.list" :key="j">
+						<view v-if="goods.product_type == 2">
+							<view class="product-item">
+								<view class="img-box">
+									<image :src="goods.productPresellAttr.image || goods.product.image"></image>
+								</view>
+								<view class="content event_content">
+									<view class="name line1"><text
+											class="event_name event_bg">预售</text>{{goods.productPresell.store_name}}
+									</view>
+									<view class="label" style="width: 70%;">{{goods.productAttr.sku}}</view>
+									<view class="price">
+										￥{{goods.productPresellAttr.presell_price}}
+										<text>X{{goods.cart_num}}</text>
+									</view>
+									<view class="event_ship event_color">发货时间：
+										<!--全款预售-->
+										<text
+											v-if="goods.productPresell.presell_type === 1">{{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内</text>
+										<!--定金预售-->
+										<text
+											v-if="goods.productPresell.presell_type === 2">{{ goods.productPresell.delivery_type === 1 ? '付尾款后' : '预售结束后' }}{{ goods.productPresell.delivery_day }}天内</text>
+									</view>
+									<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
+										<text class="iconfont icon-zhuyi-copy"></text>
+										<view class="txt">此商品不支持该区域配送</view>
+									</view>
+								</view>
+							</view>
+							<view v-if="goods.productPresell.presell_type === 2" class="event_payTime">
+								<view class="event_progress">
+									<view class="progress_step">
+										<text class="name color_red">定金</text>
+										<text
+											class="price color_red">￥{{ (goods.productPresellAttr.down_price * goods.cart_num).toFixed(2) }}</text>
+									</view>
+									<view class="progress_step">
+										<text class="name">尾款</text>
+										<text
+											class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text>
+									</view>
+									<view class="progress_pay">
+										{{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
+									</view>
+								</view>
+							</view>
+						</view>
+						<view v-else>
+							<view class="product-item">
+								<view class="img-box">
+									<image :src="goods.productAttr.image || goods.product.image"></image>
+								</view>
+								<view class="content">
+									<view class="name line1">{{goods.product.store_name}}</view>
+									<view class="label">{{goods.productAttr.sku}}</view>
+									<view class="price acea-row row-between">
+										<view class="acea-row row-middle">
+											<block v-if="order_type == 3">
+												￥{{goods.productAssistAttr.assist_price}}
+											</block>
+											<block v-else-if="order_type == 4">
+												￥{{goods.activeSku.active_price}}
+											</block>
+											<block v-else>
+												￥{{goods.productAttr.price}}
+											</block>
+											<text>X{{goods.cart_num}}</text>
+											<view v-if="goods.productAttr.show_svip_price" class="vipImg">
+												<image src="/static/images/svip.png"></image>
+											</view>
+										</view>
+										<view class="delivery_type">
+											<text v-if="!goods.allow_delivery">不支持快递</text>
+											<text v-if="!goods.allow_take">不支持到店核销</text>
+										</view>
+
+									</view>
+									<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
+										<text class="iconfont icon-zhuyi-copy"></text>
+										<view class="txt">此商品不支持该区域配送</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="wrapper">
+						<!-- <view class="boxs">
+							<view class='item acea-row row-between-wrapper'>
+								<view>配送方式</view>
+								
+								<view
+									v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
+									class='discount' @tap="openShowBox(item,index)">
+									{{item.order.isTake==0 ? deliveryName :'到店核销'}}
+									<text class='iconfont icon-jiantou'></text>
+								</view>
+								<view v-else class='discount'>
+									{{item.order.isTake==0 ? deliveryName :'到店核销'}}
+								</view>
+							</view>
+							<view class="store-address" v-if="item.order.isTake">
+								<view class="name line2">{{item.take.mer_take_name}}</view>
+								<view class="info line2">{{item.take.mer_take_address}}</view>
+								<view class="map" @click="goMap(item)">
+									<text class="iconfont icon-chakanditu"></text>
+									<view class="map_text">查看地图</view>
+								</view>
+							</view>
+						</view>
+						<view class='item acea-row row-between-wrapper'
+							v-if='shippingType==0 && item.isTake == 0 && order_model == 0'>
+							<view>快递费用 <text
+									v-if="item.list[0].productPresell && item.list[0].productPresell.presell_type == 2">(尾款阶段）</text>
+							</view>
+							<view class='discount' v-if='item.order.postage_price > 0'>+￥{{item.order.postage_price}}
+							</view>
+							<view class='discount' v-else>免运费</view>
+						</view> -->
+						<view class='item acea-row row-between-wrapper'
+							v-if="!seckillId && order_type != 3 && order_type != 4 && item.order.enabledCoupon">
+							<view>店铺优惠券</view>
+							<block v-if="item.coupon.length>0">
+								<view class='discount' @tap='couponTap(item,index)'>
+									<text v-if="item.order.coupon_price>0">优惠￥{{item.order.coupon_price}}</text>
+									<text v-else>暂未选择优惠券</text>
+									<text class='iconfont icon-jiantou'></text>
+								</view>
+							</block>
+							<block v-else>
+								<view class='discount'>暂无优惠券</view>
+							</block>
+						</view>
+						<!-- <view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
+							<view>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
+							<view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
+								{{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
+								<text class='iconfont icon-jiantou'></text>
+							</view>
+						</view> -->
+						<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
+							class="item acea-row row-between-wrapper"
+							style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">
+							<checkbox-group class="checkgroup" @change='changeIsAgree'>
+								<text class="iconfont icon-wenhao1"></text>
+								<text @click="getPresellAgree">我已同意定金不退等预售协议</text>
+								<checkbox class="checkbox" :checked="isAgree ? true : false" />
+							</checkbox-group>
+						</view>
+						<view class='item acea-row row-between-wrapper' v-if="textareaStatus">
+							<view style="width: 100px;">备注信息</view>
+							<input v-if="coupon.status===false" placeholder-class='placeholder'
+								@input='bindHideKeyboard' value="" name="mark" placeholder='选填备注信息'
+								v-model="msgObj[item.mer_id]"></input>
+						</view>
+						<view class="total">
+							共{{item.order.total_num}}件 小计
+							<view class="price" v-if="item.isTake == 0"><text>￥</text>{{ item.order.pay_price }}</view>
+							<view class="price" v-if="item.isTake == 1"><text>￥</text>{{ item.order.org_price}}</view>
+						</view>
+						<view class="total" v-if="item.credit_buy == 1 && active == 4">
+							实付价
+							<view class="price"><text>￥</text>0.00</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!--虚拟商品-->
+			<view class="wrapper virtual_form">
+				<form report-submit='true'>
+					<view v-for="(item,index) in order_extend" :key="item.title">
+						<view v-if="item.key == 'mobile'" class='item acea-row row-between-wrapper'>
+							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
+							<view class='discount'>
+								<input type="text" v-model="item.value" placeholder="请填写手机号"
+									placeholder-class='placeholder' />
+							</view>
+						</view>
+						<view v-if="item.key == 'email'" class='item acea-row row-between-wrapper'>
+							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
+							<view class='discount'>
+								<input type="text" v-model="item.value" placeholder="请填写邮箱"
+									placeholder-class='placeholder' />
+							</view>
+						</view>
+						<view v-if="item.key == 'idCard'" class='item acea-row row-between-wrapper'>
+							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
+							<view class='discount'>
+								<input type="text" v-model="item.value" placeholder="请填写身份证号"
+									placeholder-class='placeholder' />
+							</view>
+						</view>
+						<view v-if="item.key == 'text' || item.key == 'number'"
+							class='item acea-row row-between-wrapper'>
+							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
+							<view class='discount'>
+								<input v-if="item.key == 'text'" type="text" v-model="item.value"
+									:placeholder="'请填写'+item.title" placeholder-class='placeholder' />
+								<input v-if="item.key == 'number'" type="number" v-model="item.value"
+									:placeholder="'请填写'+item.title" placeholder-class='placeholder' />
+							</view>
+						</view>
+						<view v-if="item.key == 'date'" class='item acea-row row-between-wrapper'>
+							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
+							<view class='discount'>
+								<picker mode="date" :value="item.value" start="1970-01-01" @change="bindDateChange">
+									<input type="text" @click="getTime(index)" disabled v-model="item.value"
+										placeholder="请选择日期" placeholder-class='placeholder' />
+								</picker>
+							</view>
+						</view>
+						<view v-if="item.key == 'time'" class='item acea-row row-between-wrapper'>
+							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
+							<view class='discount'>
+								<picker mode="time" :value="item.value" start="1970-01-01" @change="bindDateChange">
+									<input type="text" @click="getTime(index)" disabled v-model="item.value"
+										placeholder="请选择时间" placeholder-class='placeholder' />
+								</picker>
+							</view>
+						</view>
+						<view v-if="item.key == 'image'" class='item'>
+							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
+							<view class="upload">
+								<view class='pictrue' v-for="(itemn,indexn) in item.value" :key="indexn"
+									:data-index="indexn" @click="getPhotoClickIdx">
+									<image :src="itemn"></image>
+									<text class="iconfont icon-guanbi4" @click.stop="DelPic(item,indexn)"></text>
+								</view>
+								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(item)'
+									v-if="pics.length < 5">
+									<text class='iconfont icon-icon25201'></text>
+									<view>上传图片</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</form>
+			</view>
+			<view class="settlementAgreement" v-if="showProtocol">
+				<view class="setAgCount">
+					<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
+					<div class="title">{{agrementTtile}}</div>
+					<view class="content">
+						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
+					</view>
+				</view>
+			</view>
+			<!--收货人信息-->
+			<view v-if="is_take" class="wrapper virtual_form">
+				<form report-submit='true'>
+					<view class='item acea-row row-between-wrapper'>
+						<view><text class="item-require">*</text>收货人姓名</view>
+						<view class='discount'>
+							<input type="text" v-model="post.real_name" placeholder="请填写收货人姓名"
+								placeholder-class='placeholder' />
+						</view>
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view><text class="item-require">*</text>收货人电话</view>
+						<view class='discount'>
+							<input type="number" v-model="post.phone" placeholder="请填写收货人电话"
+								placeholder-class='placeholder' />
+						</view>
+					</view>
+				</form>
+			</view>
+			<view class='wrapper' v-if="false">
+				<view class='item'>
+					<view>支付方式</view>
+					<view class='list'>
+						<!-- #ifdef H5 -->
+						<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+							v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+							<view class='name acea-row row-center-wrapper'>
+								<view class='iconfont animated'
+									:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+								{{item.name}}
+							</view>
+							<view class='tip'>
+								{{item.title}}
+								<block v-if="item.value == 'balance'">
+									{{userInfo.now_money}}
+								</block>
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifdef MP || APP-PLUS -->
+						<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+							v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+							<view class='name acea-row row-center-wrapper'>
+								<view class='iconfont animated'
+									:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+								{{item.name}}
+							</view>
+							<view class='tip'>
+								{{item.title}}
+								<block v-if="item.value == 'balance'">
+									{{userInfo.now_money}}
+								</block>
+							</view>
+						</view>
+						<!-- #endif -->
+					</view>
+				</view>
+			</view>
+			<view class='moneyList'>
+				<view class='item acea-row row-between-wrapper'>
+					<view>商品总价：</view>
+					<view class='money'>￥{{proPrice}}</view>
+				</view>
+				<view class='item acea-row row-between-wrapper' v-if="couponData.order_total_postage > 0">
+					<view>运费：</view>
+					<view class='money'>￥{{couponData.order_total_postage}}</view>
+				</view>
+				<view class='item acea-row row-between-wrapper' v-if="coupon_price > 0">
+					<view>店铺优惠金额：</view>
+					<view class='money'>-￥{{coupon_price}}</view>
+				</view>
+				<view class='item acea-row row-between-wrapper'
+					v-if="open_integral && userInfo.integral>0 && order_type == 0">
+					<view>积分抵扣：</view>
+					<view class='money'>
+						<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text>
+						<text v-else>使用了{{integral_count}}个积分，抵扣<text class="pColor">{{integral_price}}元</text></text>
+						<checkbox-group class="checkbox integral_checked" name="isDefault" @change="changeIntegral">
+							<label>
+								<checkbox :checked="use_integral ? true : false" />
+							</label>
+						</checkbox-group>
+					</view>
+				</view>
+				<view class='item acea-row row-between-wrapper'
+					v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
+					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
+					<block v-if="platformCoupon.length > 0">
+						<view class='discount money' @tap='couponTap2(platformCoupon,0)'>
+							<text v-if="total_platform_coupon_price>0">优惠￥{{total_platform_coupon_price}}</text>
+							<text v-else>暂未选择优惠券</text>
+							<text class='iconfont icon-jiantou'></text>
+						</view>
+					</block>
+					<block v-else>
+						<view class='discount'>暂无优惠券</view>
+					</block>
+				</view>
+				<view class='item acea-row row-between-wrapper' v-if="priceGroup.storePostage > 0">
+					<view>运费：</view>
+					<view class='money'>+￥{{priceGroup.storePostage}}</view>
+				</view>
+			</view>
+			<view style='height:140rpx;'></view>
+			<view class='footer acea-row row-between-wrapper'>
+				<view class="footer_count">
+					<view>
+						合计:
+						<text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
+						<text class='pColor' v-else>￥{{totalPrice }}</text>
+					</view>
+					<view style="font-size: 12px;color: #F84221;" v-if="cartArr[4].payStatus == 1 && active == 4">
+						可结算周期到期后再付款<text style="font-size: 14px;">￥{{totalPrice}}</text>
+					</view>
+					<view class="coupon_price" v-if="couponData.total_coupon > 0">
+						优惠:¥ {{couponData.total_coupon}}
+						<text @click="openDiscount">优惠明细</text>
+					</view>
+				</view>
+				<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
+					@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
+			</view>
+		</view>
+		<block v-if="coupon.status">
+			<couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'"
+				@ChangCouponsClone="ChangCouponsClone" @getCoupon="getCoupon" :openType='openType'
+				@ChangCoupons="ChangCoupons" :coupon_amount='coupon_amount' :coupon_number='coupon_number'>
+			</couponListWindow>
+		</block>
+		<addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address'
+			:pagesUrl="pagesUrl" @OnChangeAddress="OnChangeAddress" @changeClose="changeClose"></addressWindow>
+		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<block v-if="isShowBox">
+			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
+				:radioList="radioList" @close="boxClose" @confirmBtn="getData">
+			</checkDelivery>
+		</block>
+		<!--优惠明细弹窗-->
+		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData">
+		</discountDetails>
+	</view>
+</template>
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	let app = getApp();
+	import {
+		orderConfirm,
+		getOrderConfirm,
+		getCouponsOrderPrice,
+		orderCreate,
+		createOrder,
+    createOtherOrder
+	} from '@/api/order.js';
+	import {
+		getAddressDefault,
+		getAddressDetail,
+		getAddressList,
+		getUserInfo,
+		getAgreementApi
+	} from '@/api/user.js';
+	import {
+		openPaySubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		presellAgreement
+	} from '@/api/activity.js';
+	import {
+		storeListApi
+	} from '@/api/store.js';
+	import {
+		CACHE_LONGITUDE,
+		CACHE_LATITUDE
+	} from '@/config/cache.js';
+	import couponListWindow from '@/components/orderCoupon';
+	import addressWindow from '@/components/addressWindow';
+	import orderGoods from '@/components/orderGoods';
+	import checkDelivery from '@/components/checkDelivery/index.vue';
+	import discountDetails from '@/components/discountDetails/index.vue';
+	import addInvoicing from '@/components/addInvoicing';
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+import { Toast } from '../../../libs/uniApi';
+	export default {
+		components: {
+			couponListWindow,
+			addressWindow,
+			orderGoods,
+			checkDelivery,
+			addInvoicing,
+			discountDetails,
+			"jyf-parser": parser,
+			authorize,
+		},
+		filters: {
+			filterDay(val) {
+				if (val) {
+					var reg = /(\d{4})\-(\d{2})\-(\d{2})/;
+					var date = val.replace(reg, "$2月$3日");
+					return date
+				}
+			}
+		},
+		data() {
+			return {
+				// 备注
+				msgObj: {},
+				textareaStatus: true,
+				deliveryName: '快递配送',
+				//支付方式
+				cartArr: [{
+						"name": "微信支付",
+						"icon": "icon-weixin2",
+						value: 'weixin',
+						title: '微信快捷支付',
+						payStatus: 1,
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-icon34",
+						// #ifdef H5 || APP-PLUS
+						value: 'alipay',
+						// #endif
+						// #ifdef MP
+						value: 'alipayQr',
+						// #endif
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						"name": "余额支付",
+						"icon": "icon-icon-test",
+						value: 'balance',
+						title: '可用余额:',
+						payStatus: this.$store.getters.globalData.yue_pay_status,
+					},
+					{
+						"name": "线下支付",
+						"icon": "icon-yinhangqia",
+						value: 'offline',
+						title: '线下支付',
+						payStatus: 2,
+					}, {
+						"name": "先货后款",
+						"icon": "tan-a-lujing17324",
+						value: 'creditBuy',
+						title: `结算周期：${this.settle_cycle}天 日利率：${this.interest_rate}%`,
+						payStatus: '',
+					},
+				],
+				tagStyle: {
+					img: 'width:100%;display:block;',
+					video: 'width:100%;'
+				},
+				radioList: [{
+						title: this.deliveryName,
+						check: true
+					},
+					{
+						title: '到店核销',
+						check: false
+					}
+				],
+				payType: 'weixin', //支付方式
+				openType: 1, //优惠券打开方式 1=使用
+				active: 0, //支付方式切换
+				coupon: {
+					status: false,
+					list: [],
+					statusTile: '立即使用'
+				}, //优惠券组件
+				address: {
+					address: false
+				}, //地址组件
+				addressInfo: {}, //地址信息
+				invoice: {
+					invoice: false,
+					mer_id: 0,
+					add: true
+				}, //发票组件
+				invoiceData: {}, // 发票数据
+				pinkId: 0, //拼团id
+				addressId: 0, //地址id
+				couponId: 0, //优惠券id
+				cartId: '', //购物车id
+				BargainId: 0,
+				combinationId: 0,
+				seckillId: 0,
+				userInfo: {}, //用户信息
+				post: {},
+				mark: '', //备注信息
+				couponTitle: '请选择', //优惠券
+				coupon_price: 0, //优惠券抵扣金额
+				useIntegral: false, //是否使用积分
+				integral_price: 0, //积分抵扣金额
+				integral: 0,
+				ChangePrice: 0, //使用积分抵扣变动后的金额
+				formIds: [], //收集formid
+				status: 0,
+				is_address: false,
+				toPay: false, //修复进入支付时页面隐藏从新刷新页面
+				shippingType: 0,
+				system_store: {},
+				storePostage: 0,
+				contacts: '',
+				contactsTel: '',
+				mydata: {},
+				storeList: [],
+				store_self_mention: 0,
+				cartInfo: [],
+				priceGroup: {},
+				animated: false,
+				totalPrice: 0,
+				use_integral: false,
+				pagesUrl: "",
+				orderKey: "",
+				offlinePostage: "",
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				from: '',
+				orderStatus: '', //是否有地址
+				couponIndex: 0, //选择商铺优惠券索引
+				subCoupon: {}, //提交订单使用的优惠券
+				proPrice: 0, //商品总价
+				isShowBox: false,
+				activeObj: {}, //选中店铺信息
+				activeIndex: '', // 选中店铺索引
+				invoiceName: '不开发票',
+				invoice_func: false,
+				special_invoice: false,
+				isAgree: false,
+				showProtocol: false,
+				isCoupon: false,
+				protocol: '',
+				order_type: 0,
+				addInvoice: {},
+				couponData: {},
+				go_map: false,
+				orderPay: false,
+				take: [],
+				open_integral: 0,
+				coupon_number: 0,
+				store_coupon_number: 0,
+				coupon_amount: 0,
+				store_coupon_amount: 0,
+				plant_coupon_amount: 0,
+				integral_count: '',
+				agrementTtile: '发票说明',
+				pics: [],
+				order_model: 2,
+				allow_address: true,
+				order_extend: [],
+				extend: [],
+				virtualIndex: 0,
+				platformCoupon: [],
+				total_platform_coupon_price: 0,
+				enabledPlatformCoupon: false,
+				plantCoupon: false,
+				isShowDiscount: false,
+				order_key: '',
+				is_take: '',
+				domain: HTTP_REQUEST_URL,
+				product_type: '',
+				interest_rate: '', //利率
+				settle_cycle: '', // 周期
+				type_id: '', //店铺类型
+        source: '', //进货类型
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor']),
+			...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']),
+		},
+		watch: {
+			alipay_open(n) {
+				this.payMode[1].payStatus = n
+			},
+			yue_pay_status(n) {
+				this.payMode[2].payStatus = n
+			}
+		},
+		onReady() {},
+		mounted: function() {},
+		onLoad: function(options) {
+      this.source = options.source;
+			this.type_id = options.type_id
+			this.product_type = options.product_type
+			this.seckillId = options.seckillId
+			// #ifdef H5
+			this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
+			// #endif
+			// #ifdef MP
+			this.from = 'routine'
+			// #endif
+			// #ifdef APP-PLUS
+			this.from = 'weixin'
+			// #endif
+			if (!options.cartId) return this.$util.Tips({
+				title: '请选择要购买的商品'
+			}, {
+				tab: 3,
+				url: 1
+			});
+			this.couponId = options.couponId || 0;
+			this.pinkId = options.pinkid ? parseInt(options.pinkid) : 0;
+			this.addressId = options.addressId || 0;
+			this.cartId = options.cartId;
+			this.is_address = options.is_address ? true : false;
+			this.news = options.new ? 1 : 0;
+			this.invoice_id = options.invoice_id || '';
+			if (options.invoice_type == 1) {
+				this.invoiceName = '增值税电子普通发票';
+			} else if (options.invoice_type == 2) {
+				this.invoiceName = '增值税专用发票';
+			}
+			if (!this.isLogin) {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+			if (this.payType == 'weixin') {
+				this.payType = this.from
+			}
+			// this.getAgreement();
+			let _this = this
+			this.textareaStatus = true;
+			uni.setStorage({
+				key: 'invoice_Data',
+				data: {},
+				success: function() {}
+			})
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {
+			let that = this;
+			uni.$on("handClick", res => {
+				if (res) {
+					_this.system_store = res.address
+				}
+				// 清除监听
+				uni.$off('handClick');
+			})
+			that.invoice.invoice = false
+			if (this.isLogin && this.toPay == false && !this.orderPay) {
+				this.getaddressInfo();
+				this.$nextTick(function() {
+					this.$refs.addressWindow.getAddressList();
+					this.getUserInfo()
+				})
+			}
+		},
+		/**
+		 * 生命周期函数--监听页面隐藏
+		 */
+		// onHide: function() {
+		// },
+		methods: {
+			/*预售协议*/
+			getPresellAgree: function() {
+				this.showProtocol = true
+				this.agrementTtile = '预售协议'
+				presellAgreement().then(res => {
+					this.protocol = res.data.sys_product_presell_agree;
+				})
+			},
+			changeIsAgree: function(e) {
+				this.isAgree = !this.isAgree;
+			},
+			changeIntegral: function(e) {
+				this.use_integral = !this.use_integral;
+				this.getConfirm(this.addressId);
+			},
+			showPresellAgree() {
+				this.getPresellAgree()
+			},
+			showInvoice() {
+				this.getAgreement();
+			},
+			showCoupon() {
+				this.getCouponAgreement();
+			},
+			// 打开配送方式弹窗
+			openDiscount(item, index) {
+				this.isShowDiscount = !this.isShowDiscount;
+			},
+			closeDiscount() {
+				this.isShowDiscount = false
+			},
+			// 图片预览
+			// 获得相册 idx
+			getPhotoClickIdx(e) {
+				let _this = this;
+				let idx = e.currentTarget.dataset.index;
+				_this.imgPreview(_this.pics, idx);
+			},
+			// 图片预览
+			imgPreview: function(list, idx) {
+				// list：图片 url 数组
+				if (list && list.length > 0) {
+					uni.previewImage({
+						current: list[idx], //  传 Number H5端出现不兼容
+						urls: list
+					});
+				}
+			},
+			/**上传文件*/
+			uploadpic: function(item) {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					let pics = item.value || []
+					pics.push(res.data.path);
+					that.$set(item, 'value', pics);
+				});
+			},
+			/** 删除图片*/
+			DelPic: function(item, index) {
+				let that = this,
+					pic = this.pics[index];
+				item.value.splice(index, 1);
+				// that.$set(that, 'pics', that.pics);
+			},
+			// 获取个人信息
+			getUserInfo() {
+				getUserInfo().then(res => {
+					this.userInfo = res.data
+
+				})
+			},
+			/*获取发票说明*/
+			getAgreement() {
+				let that = this
+				that.showProtocol = true;
+				that.agrementTtile = '发票说明'
+				getAgreementApi('sys_receipt_agree').then(res => {
+					that.protocol = res.data.sys_receipt_agree
+				})
+			},
+			/*获取发票说明*/
+			getCouponAgreement() {
+				let that = this
+				that.showProtocol = true;
+				that.agrementTtile = '优惠券说明'
+				getAgreementApi('sys_coupon_agree').then(res => {
+					// console.log(res);
+					that.protocol = res.data.sys_coupon_agree
+				})
+			},
+			/**
+			 * 授权回调事件
+			 *
+			 */
+			onLoadFun: function() {
+				this.isShowAuth = false;
+				this.getaddressInfo();
+				this.getUserInfo();
+				//调用子页面方法授权后执行获取地址列表
+				// this.$scope.selectComponent('#address-window').getAddressList();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			/**
+			 * 获取门店列表数据
+			 */
+			getList: function() {
+				let longitude = uni.getStorageSync("CACHE_LONGITUDE"); //经度
+				let latitude = uni.getStorageSync("CACHE_LATITUDE"); //纬度
+				let data = {
+					latitude: latitude, //纬度
+					longitude: longitude, //经度
+					page: 1,
+					limit: 10
+				}
+				storeListApi(data).then(res => {
+					let list = res.data.list.list || [];
+					this.$set(this, 'storeList', list);
+					this.$set(this, 'system_store', list[0]);
+				}).catch(err => {})
+			},
+			// 关闭地址弹窗；
+			changeClose: function() {
+				this.$set(this.address, 'address', false);
+			},
+			// 关闭发票弹窗
+			changeInvoiceClose: function(data) {
+				this.getInvoiceData(data);
+				this.$set(this.invoice, 'invoice', false);
+			},
+			getInvoiceData(selectedData) {
+				this.invoiceData = {}
+				if (selectedData) {
+					this.cartInfo.forEach((item, i) => {
+						if (item.mer_id == selectedData.mer_id) {
+							if (this.cartInfo[i]['invoiceData']) {
+								this.cartInfo[i]['invoiceData'] = selectedData
+							} else {
+								this.$set(this.cartInfo[i], 'invoiceData', selectedData)
+							}
+						}
+						let mer_id = selectedData.mer_id
+						this.invoiceData[mer_id] = selectedData;
+					});
+				} else {
+					this.cartInfo.forEach((item, i) => {
+						this.$set(this.cartInfo[i], 'invoiceData', {})
+					});
+				}
+			},
+			getInvoiceDatas(selectedData) {
+				this.invoiceData = {}
+				if (selectedData.length) {
+					this.cartInfo.forEach((item, i) => {
+						selectedData.forEach((val, j) => {
+							if (item.mer_id == val.mer_id) {
+								if (this.cartInfo[i]['invoiceData']) {
+									this.cartInfo[i]['invoiceData'] = val
+								} else {
+									this.$set(this.cartInfo[i], 'invoiceData', val)
+								}
+							}
+							let mer_id = val.mer_id
+							this.invoiceData[mer_id] = val;
+						})
+					});
+				} else {
+					this.cartInfo.forEach((item, i) => {
+						this.$set(this.cartInfo[i], 'invoiceData', {})
+					});
+				}
+				// console.log(this.invoiceData)
+			},
+			/*
+			 * 跳转门店列表
+			 */
+			showStoreList: function() {
+				let _this = this
+				if (this.storeList.length > 0) {
+					uni.navigateTo({
+						url: '/pages/users/goods_details_store/index'
+					})
+				}
+			},
+			// 进店
+			goStore: function(id) {
+				if (this.hide_mer_status != 1) {
+					uni.navigateTo({
+						url: `/pages/store/home/index?id=${id}`
+					})
+				}
+			},
+			ChangCouponsClone: function() {
+				this.$set(this.coupon, 'status', false);
+			},
+			changeTextareaStatus: function() {
+				for (let i = 0, len = this.coupon.list.length; i < len; i++) {
+					this.coupon.list[i].use_title = '';
+					this.coupon.list[i].is_use = 0;
+				}
+				this.textareaStatus = true;
+				this.status = 0;
+				this.$set(this.coupon, 'list', this.coupon.list);
+			},
+			/**
+			 * 处理点击优惠券后的事件
+			 *
+			 */
+			ChangCoupons: function(data) {
+				this.cartInfo.forEach((item, index) => {
+					if (item.mer_id == data.mer_id) {
+						this.$set(this.cartInfo, index, data)
+					}
+				})
+				this.$set(this.coupon, 'status', false);
+				this.couponNum()
+			},
+			// 计算优惠券抵扣
+			couponNum() {
+				let tempTotal = 0,
+					tempCouponNum = 0
+				this.cartInfo.forEach((item, index) => {
+					tempCouponNum = this.$util.$h.Add(tempCouponNum, item.order.coupon_price)
+					tempTotal = this.$util.$h.Add(tempTotal, item.order.pay_price)
+				})
+				this.coupon_price = tempCouponNum
+				if (this.order_type == 2 && this.coupon.list[0].productPresell.presell_type == 2) {
+					return
+				}
+				this.totalPrice = tempTotal
+			},
+			/**
+			 * 选择地址后改变事件
+			 * @param object e
+			 */
+			OnChangeAddress: function(e) {
+				this.textareaStatus = true;
+				this.addressId = e;
+				this.address.address = false;
+				this.getaddressInfo();
+			},
+			bindHideKeyboard: function(e) {
+				this.mark = e.detail.value;
+			},
+			getCoupon(coupon) {
+				if (coupon.checked) {
+					this.subCoupon[coupon.mer_id].forEach((item, i) => {
+						if (coupon.coupon_user_id == item) {
+							this.subCoupon[coupon.mer_id].splice(i, 1)
+						}
+					})
+				} else {
+					this.subCoupon[coupon.mer_id].push(coupon.coupon_user_id)
+				}
+				this.getConfirm(this.addressId)
+			},
+			/**
+			 * 获取当前订单详细信息
+			 *
+			 */
+			getConfirm: function(address_id) {
+				// console.log(address_id, 'address_id')
+				// console.log(this.take,)
+				// console.log(this.subCoupon,)
+				// console.log(this.use_integral, )
+				let that = this;
+				// console.log(that.cartId.split(","))
+				uni.showLoading({
+					title: '',
+					mask: true
+				});
+				getOrderConfirm({
+					cart_id: that.cartId.split(","),
+					address_id: address_id,
+					takes: that.take,
+					use_coupon: that.subCoupon,
+					use_integral: that.use_integral,
+          // source: 0
+				}).then(res => {
+					// 默认选中
+					that.product_type=res.data.order_type
+					that.is_take = false
+					res.data.order.forEach(el => {
+						if (el.order.isTake == 1) that.is_take = true
+						el.isTake = 0
+						that.subCoupon[el.mer_id] = []
+						el.coupon.forEach(coupon => {
+							if (coupon.checked) {
+								that.subCoupon[el.mer_id].push(coupon.coupon_user_id)
+							}
+						})
+					})
+					that.subCoupon['0'] = []
+					if (res.data?.platformCoupon?.length > 0) {
+						res.data.platformCoupon.forEach(el => {
+							if (el.checked) {
+								that.subCoupon[el.mer_id] = []
+								that.subCoupon[el.mer_id].push(el.coupon_user_id)
+							}
+						})
+					}
+					that.$set(that.coupon, "coupon", that.plantCoupon ? res.data.platformCoupon : res.data
+						.order[that.couponIndex].coupon);
+					that.$set(that, "store_coupon_number", res.data.order[that.couponIndex].order.useCouponIds
+						.length);
+					that.$set(that, "coupon_amount", parseFloat(res.data.order[that.couponIndex].order
+						.coupon_price) + parseFloat(res.data.total_platform_coupon_price));
+					that.$set(that, "store_coupon_amount", parseFloat(res.data.order[that.couponIndex].order
+						.coupon_price));
+					that.$set(that, "plant_coupon_amount", parseFloat(res.data.total_platform_coupon_price));
+					that.$set(that, 'couponData', res.data);
+					that.$set(that, 'cartInfo', res.data.order);
+					that.$set(that, 'total_platform_coupon_price', res.data.total_platform_coupon_price);
+					that.$set(that, 'enabledPlatformCoupon', res.data.enabledPlatformCoupon);
+					that.$set(that, 'platformCoupon', res.data.platformCoupon);
+					that.$set(that, 'order_type', res.data.order_type);
+					that.$set(that, 'coupon_price', res.data.order_coupon_price);
+					that.$set(that, 'integral_count', res.data.order_total_integral);
+					that.$set(that, 'integral_price', res.data.order_total_integral_price);
+					that.$set(that, 'open_integral', res.data.openIntegral);
+					that.$set(that, 'use_integral', res.data.useIntegral);
+					that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length > 0) ? that
+						.order_extend : res.data.order_extend);
+					that.totalPrice = res.data.order_price
+					that.orderStatus = res.data.status
+					that.proPrice = res.data.total_price
+					that.order_type = res.data.order_type
+					that.order_model = res.data.order_model
+					that.allow_address = res.data.allow_address
+					that.deliveryName = res.data.order_model == 0 ? '快递配送' : '虚拟发货'
+					that.order_key = res.data.key
+					that.cartArr[4].title =
+						`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
+            
+          // console.log(res.data);
+					if (res.data.order[0].credit_buy == 1 && (this.type_id == 12||this.type_id == 10||this.type_id == 17) && (res.data.order_type==99||res.data.order_type==98)) {
+						this.cartArr[4].payStatus = 1
+					} else {
+						this.cartArr[4].payStatus = 0
+					}
+
+
+					uni.getStorage({
+						key: "invoice_Data",
+						success: function(res) {
+							that.addInvoice = res.data;
+							if (res.data) {
+								that.getInvoiceDatas(res.data)
+							}
+						}
+					})
+					uni.hideLoading();
+				}).catch(err => {
+          console.log('err', err);
+					return this.$util.Tips({
+						title: err
+					}, {
+						tab: 3,
+						url: 1
+					});
+				});
+			},
+			/*
+			 * 获取默认收货地址或者获取某条地址信息
+			 */
+			getaddressInfo: function() {
+				let that = this;
+				if (that.addressId) {
+					getAddressDetail(that.addressId).then(res => {
+						res.data.is_default = parseInt(res.data.is_default);
+						
+						that.addressInfo = res.data || {};
+						that.addressId = res.data.address_id || 0;
+						that.address.addressId = res.data.address_id || 0;
+						that.post = {
+							real_name: res.data.real_name,
+							phone: res.data.phone
+						}
+				
+						this.$nextTick(() => {
+							this.getConfirm(that.addressId);
+						})
+					})
+					
+				} else {
+					getAddressList().then(res => {
+						that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {};
+						that.addressId = res.data.list.length > 0 ? res.data.list[0].address_id : 0;
+						that.address.addressId = res.data.list.length > 0 ? res.data.list[0].address_id : 0;
+						that.post = res.data.list.length > 0 ? {
+							real_name: res.data.list[0].real_name,
+							phone: res.data.list[0].phone
+						} : {
+							real_name: '',
+							phone: ''
+						}
+						this.getConfirm(that.addressId);
+					})
+				}
+			},
+			payItem: function(e) {
+				let that = this;
+				let active = e;
+				that.active = active;
+ 				// console.log(this.active);
+				that.animated = true;
+				that.payType = that.cartArr[active].value;
+				if (that.payType == 'weixin') {
+					that.payType = that.from
+				}
+			},
+			couponTap: function(item, index) {
+				this.coupon = item
+				this.$set(this.coupon, 'status', true)
+				this.couponIndex = index
+				this.plantCoupon = false
+				this.$set(this, "coupon_number", this.store_coupon_number);
+				this.$set(this, "coupon_amount", this.store_coupon_amount);
+			},
+			couponTap2: function(item, index) {
+				this.coupon = {
+					coupon: item,
+					mer_id: 0,
+					status: true
+				}
+				this.plantCoupon = true
+				this.$set(this, "coupon_number", this.subCoupon['0'].length);
+				this.$set(this, "coupon_amount", this.plant_coupon_amount);
+			},
+			car: function() {
+				let that = this;
+				that.animated = false;
+			},
+			onAddress: function() {
+				let that = this;
+				if (that.addressInfo.real_name) {
+					that.textareaStatus = false;
+					that.address.address = true;
+					// that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
+					// 	.pinkId + '&couponId=' + this.couponId;
+				  that.pagesUrl = '/pages/users/user_address_list/index'
+				} else {
+					// uni.navigateTo({
+					// 	url: `/pages/users/user_address/index?cartId=${this.cartId}`,
+					// });
+				  uni.navigateTo({
+				  	url: `pages/users/user_address_list/index`,
+				  });
+				}
+			},
+			/**
+			 * 开发票
+			 */
+			goInvoice: function(id) {
+				let that = this;
+				that.invoice.invoice = true;
+				that.invoice.mer_id = id;
+				this.$refs.addInvoicing.getInvoiceDefault();
+				this.$refs.addInvoicing.getInvoiceList();
+			},
+			realName: function(e) {
+				this.contacts = e.detail.value;
+			},
+			phone: function(e) {
+				this.contactsTel = e.detail.value;
+			},
+			payment: function(data) {
+				let that = this;
+				createOrder(data).then(res => {
+					let status = res.data.status,
+						orderId = res.data.result.order_id,
+						callback_key = res.data.result.pay_key,
+						jsConfig = res.data.result.config,
+						// 暂不跳转
+						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
+						'&product_type=' + that.product_type,
+						goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
+						'&credit_buy=1&product_type=' + that.product_type;
+
+					that.orderPay = true;
+					uni.hideLoading();
+					switch (status) {
+						case 'ORDER_EXIST':
+						case 'EXTEND_ORDER':
+						case 'PAY_ERROR':
+						case 'error':
+							return that.$util.Tips({
+								title: res.message
+							}, {
+								tab: 5,
+								url: goPagesOrder
+							});
+							break;
+						case 'success':
+							return that.$util.Tips({
+								title: res.message,
+								icon: 'success'
+							}, {
+								tab: 5,
+								url: goPages
+							});
+							break;
+						case 'alipay':
+						case "alipayQr":
+							// uni.navigateTo({
+							//   url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
+							//     jsConfig
+							// })
+							return;
+							break;
+							// #ifndef MP
+						case "wechat":
+						case "weixin":
+						case "weixinApp":
+							jsConfig.timeStamp = jsConfig.timestamp;
+							// #ifndef APP-PLUS
+							this.$wechat.pay(jsConfig).then(res => {
+								return that.$util.Tips({
+									title: res.message,
+									icon: 'success'
+								}, {
+									tab: 4,
+									url: goPages
+								});
+							}).catch(res => {
+								if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({
+									title: '取消支付'
+								}, {
+									tab: 5,
+									url: goPages + '&status=0'
+								});
+							})
+							// #endif
+							// #ifdef APP-PLUS
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
+							}
+							uni[mp_pay_name]({
+								provider: 'wxpay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									// 暂不跳转
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=支付成功' + '&product_type=' + that.product_type;
+
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 4,
+										url: url
+									});
+								},
+								fail: (e) => {
+									// 暂不跳转
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=取消支付' + '&product_type=' + that.product_type;
+									return that.$util.Tips({
+										title: '取消支付',
+									}, {
+										tab: 4,
+										url: url
+									});
+								},
+								complete: (res) => {
+								uni.hideLoading();
+									// 暂不跳转
+									// let url = '/pages/order_pay_status/index?order_id=' + orderId +
+									// 	'&msg=取消支付' + '&product_type=' + that.product_type;
+									// return that.$util.Tips({
+									// 	title: '取消支付',
+									// }, {
+									// 	tab: 4,
+									// 	url: url
+									// });
+								},
+							});
+							// #endif
+							break;
+							// #endif
+							// #ifdef MP
+						case "routine":
+							jsConfig.timeStamp = jsConfig.timestamp;
+							that.toPay = true;
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
+							}
+							uni[mp_pay_name]({
+								...jsConfig,
+								success: function(res) {
+									uni.hideLoading();
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: goPages
+									});
+								},
+								fail: function(e) {
+									// 暂不跳转
+									let pages = '/pages/order_pay_status/index?order_id=' +
+										orderId + '&msg=取消支付' + '&product_type=' + that
+										.product_type
+									return that.$util.Tips({
+										title: '取消支付'
+									}, {
+										tab: 5,
+										url: pages + '&status=0'
+									});
+								},
+							})
+							break;
+							// #endif
+						case "balance":
+							//余额
+							return that.$util.Tips({
+								title: res.msg
+							}, {
+								tab: 5,
+								url: goPages + '&status=1'
+							});
+							break;
+							// #ifdef H5
+						case 'h5':
+							let host = window.location.protocol + "//" + window.location.host;
+							let url =
+								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}`
+							let eUrl = encodeURIComponent(url)
+							let jsurl = jsConfig.mweb_url || jsConfig.h5_url
+							let locations = `${jsurl}&redirect_url=${eUrl}`
+							// 暂不跳转
+							setTimeout(() => {
+								location.href = locations;
+							}, 100);
+							break;
+							// #endif
+							// #ifdef APP-PLUS
+						case 'alipayApp':
+							uni.requestPayment({
+								provider: 'alipay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: goPages
+									});
+								},
+								fail: (e) => {
+									// 暂不跳转
+									let pages = '/pages/order_pay_status/index?order_id=' +
+										orderId + '&msg=支付失败' + '&product_type=' + that
+										.product_type
+									return that.$util.Tips({
+										title: '支付失败'
+									}, {
+										tab: 5,
+										url: pages
+									});
+								},
+								complete: () => {
+									uni.hideLoading();
+									// // 暂不跳转
+									// let pages = '/pages/order_pay_status/index?order_id=' +
+									// 	orderId + '&msg=取消支付' + '&product_type=' + that
+									// 	.product_type
+
+									// return that.$util.Tips({
+									// 	title: '取消支付'
+									// }, {
+									// 	tab: 5,
+									// 	url: pages
+									// });
+								},
+							});
+							break;
+							// #endif
+						default:
+							// 暂不跳转
+							let pages = '/pages/order_pay_status/index?order_id=' +
+								orderId + '&msg=取消支付' + '&product_type=' + that.product_type
+
+							return that.$util.Tips({
+								title: '取消支付'
+							}, {
+								tab: 5,
+								url: pages + '&status=0'
+							});
+					}
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			isEmojiCharacter: function(substring) {
+				if (substring) {
+					for (var i = 0; i < substring.length; i++) {
+						var hs = substring.charCodeAt(i);
+						if (0xd800 <= hs && hs <= 0xdbff) {
+							if (substring.length > 1) {
+								var ls = substring.charCodeAt(i + 1);
+								var uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000;
+								if (0x1d000 <= uc && uc <= 0x1f77f) {
+									return true;
+								}
+							}
+						} else if (substring.length > 1) {
+							var ls = substring.charCodeAt(i + 1);
+							if (ls == 0x20e3) {
+								return true;
+							}
+						} else {
+							if (0x2100 <= hs && hs <= 0x27ff) {
+								return true;
+							} else if (0x2B05 <= hs && hs <= 0x2b07) {
+								return true;
+							} else if (0x2934 <= hs && hs <= 0x2935) {
+								return true;
+							} else if (0x3297 <= hs && hs <= 0x3299) {
+								return true;
+							} else if (hs == 0xa9 || hs == 0xae || hs == 0x303d || hs == 0x3030 ||
+								hs == 0x2b55 || hs == 0x2b1c || hs == 0x2b1b ||
+								hs == 0x2b50) {
+								return true;
+							}
+						}
+					}
+				}
+			},
+			bindDateChange(e) {
+				let that = this
+				that.$set(that.order_extend[that.virtualIndex], 'value', e.detail.value);
+			},
+			getTime(index) {
+				this.virtualIndex = index;
+			},
+			SubOrder: function(e) {
+
+				let that = this,
+					data = {};
+				// if (!that.payType) return that.$util.Tips({
+				// 	title: '请选择支付方式'
+				// });
+				if (that.orderStatus == 'noAddress') return that.$util.Tips({
+					title: '请选择收货地址'
+				});
+				if (that.orderStatus != 'finish' && that.order_model == 0) {
+					return that.$util.Tips({
+						title: '收货地址不在配送区域'
+					});
+				}
+				if (that.orderStatus == 'noDeliver') {
+					return that.$util.Tips({
+						title: '暂不发货'
+					});
+				}
+				if (that.order_type == 2 && !that.isAgree && that.cartInfo[0].list[0].productPresell.presell_type ==
+					2) {
+					return that.$util.Tips({
+						title: '请阅读并勾选协议，否则无法进行操作'
+					});
+				}
+				if (that.order_model == 1 && that.order_extend.length > 0) {
+					for (var i = 0; i < that.order_extend.length; i++) {
+						let el = that.order_extend[i]
+						if (el.require) {
+							if (!el.value || el.value.length == 0) {
+								return that.$util.Tips({
+									title: '请填写' + el.title
+								});
+							} else if (el.key == 'mobile' && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(el.value)) {
+								return that.$util.Tips({
+									title: '请输入正确的' + el.title
+								});
+							} else if (el.key == 'email' && !/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(el
+									.value)) {
+								return that.$util.Tips({
+									title: '请输入正确的' + el.title
+								});
+							} else if (el.key == 'idCard' && !
+								/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/
+								.test(el.value)) {
+								return that.$util.Tips({
+									title: '请输入正确的' + el.title
+								});
+							}
+						} else if (el.value) {
+							if (el.key == 'mobile' && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(el.value)) {
+								return that.$util.Tips({
+									title: '请输入正确的' + el.title
+								});
+							}
+							if (el.key == 'email' && !/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(el.value)) {
+								return that.$util.Tips({
+									title: '请输入正确的' + el.title
+								});
+							}
+							if (el.key == 'idCard' && !
+								/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/
+								.test(el.value)) {
+								return that.$util.Tips({
+									title: '请输入正确的' + el.title
+								});
+							}
+						}
+						that.extend[i] = {
+							title: el.title,
+							value: el.value
+						}
+					}
+				}
+				if (that.is_take) {
+					if (!that.post.real_name) {
+						return that.$util.Tips({
+							title: '请填写收货人姓名'
+						});
+					}
+					if (!that.post.phone) {
+						return that.$util.Tips({
+							title: '请填写收货人电话'
+						});
+					}
+					if (that.post.phone && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.post.phone)) {
+						return that.$util.Tips({
+							title: '收货人电话格式不正确'
+						});
+					}
+				}
+				data = {
+					cart_id: this.cartId.split(","),
+					address_id: this.addressId,
+					use_coupon: this.subCoupon,
+					pay_type: this.payType,
+					mark: this.msgObj,
+					order_type: this.order_type,
+					key: this.order_key,
+					takes: this.take,
+					use_integral: this.use_integral,
+					receipt_data: this.invoiceData,
+					extend: this.extend,
+					post: this.post,
+					// #ifdef H5
+					return_url: 'http://' + window.location.host + '/pages/users/order_list/index',
+					// #endif
+				};
+				if (data.mark && this.isEmojiCharacter(data.mark[Object.keys(data.mark)[0]])) {
+					that.$util.Tips({
+						title: '备注不允许输入表情！'
+					});
+					return;
+				}
+				data.takes = []
+				this.cartInfo.map(el => {
+					if (el.isTake == 1 || el.order.isTake) {
+						data.takes.push(el.mer_id)
+					}
+				})
+        this.source ? data.pay_type = this.source : null;
+        createOtherOrder(data).then(res=>{
+          uni.showToast({
+            icon:"success",
+            title:res.message
+          })
+          this.$u.sleep(800).then(()=>{
+            uni.navigateBack({
+              delta: 1
+            })
+          })
+        }).catch(e=>{
+          console.log(e);
+        });
+        
+        return ;
+        
+				if (data.payType == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
+					return that.$util
+						.Tips({
+							title: '余额不足！'
+						});
+
+				// 先货后款暂不可用
+				// if (this.payType == 'creditBuy') {
+				// 	uni.navigateTo({
+				// 		ur
+				// 	})
+				// 	return
+				// }
+
+				uni.showLoading({
+					title: '订单支付中',
+					mask: true
+				});
+				// #ifdef MP
+				openPaySubscribe().then(() => {
+					that.payment(data);
+				});
+				// #endif
+				// #ifndef MP
+				that.payment(data);
+				// #endif
+			},
+			// 打开配送方式弹窗
+			openShowBox(item, index) {
+				if (item.delivery_way.length == 2) {
+					this.activeObj = item
+					this.activeIndex = index
+					this.isShowBox = true
+					this.getDeliveryType(item.order)
+				}
+			},
+			// 获取快递方式
+			getDeliveryType(item) {
+				if (item.allow_delivery && item.allow_take) {
+					this.radioList = [{
+							title: this.deliveryName,
+							check: true
+						},
+						{
+							title: '到店核销',
+							check: false
+						}
+					]
+				} else if (item.allow_delivery && !item.allow_take) {
+					this.radioList = [{
+						title: this.deliveryName,
+						check: true
+					}]
+				} else if (!item.allow_delivery && item.allow_take) {
+					this.radioList = [{
+						title: '到店核销',
+						check: false
+					}]
+				}
+			},
+			boxClose() {
+				this.isShowBox = false
+			},
+			getData(data) {
+				this.cartInfo[this.activeIndex] = data
+				if (data.order.isTake) {
+					this.take.push(data.mer_id)
+				} else {
+					this.take.forEach((item, i) => {
+						if (data.mer_id == item) {
+							this.take.splice(i, 1)
+						}
+					})
+				}
+				this.isShowBox = false
+				this.getConfirm(this.addressId);
+			},
+			//查看内置地图
+			goMap(item) {
+				let that = this;
+				let lat = Number(item.take.mer_take_location[0]),
+					long = Number(item.take.mer_take_location[1])
+				//#ifdef H5
+				if (that.$wechat.isWeixin() === true) {
+					that.$wechat.seeLocation({
+						latitude: lat,
+						longitude: long,
+						name: item.mer_name,
+						address: item.take ? item.take.mer_take_address : '',
+					}).then(res => {
+						// console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.take ? item.take.mer_take_address : '',
+						success: function(res) {
+							that.go_map = true
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
+	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
+		color: #fff !important;
+	}
+
+	.order-submission .line {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 3rpx;
+	}
+
+	.order-submission .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-submission .address {
+		padding: 28rpx 30rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+	}
+
+	.order-submission .address .addressCon {
+		width: 610rpx;
+		font-size: 26rpx;
+		color: #666;
+	}
+
+	.order-submission .address .addressCon .name {
+		font-size: 30rpx;
+		color: #282828;
+		font-weight: bold;
+		margin-bottom: 10rpx;
+	}
+
+	.order-submission .address .addressCon .name .phone {
+		margin-left: 50rpx;
+	}
+
+	.order-submission .address .addressCon .default {
+		margin-right: 12rpx;
+	}
+
+	.t-color {
+		color: var(--view-theme);
+	}
+
+	.order-submission .address .addressCon .setaddress {
+		color: #333;
+		font-size: 28rpx;
+	}
+
+	.order-submission .address .iconfont {
+		font-size: 35rpx;
+		color: #707070;
+	}
+
+	.order-submission .allAddress {
+		width: 100%;
+	}
+
+	.order-submission .allAddress .nav {
+		width: 710rpx;
+		margin: 0 auto;
+	}
+
+	.order-submission .allAddress .nav .item {
+		width: 355rpx;
+	}
+
+	.order-submission .allAddress .nav .item.on {
+		position: relative;
+		width: 250rpx;
+	}
+
+	.order-submission .allAddress .nav .item.on::before {
+		position: absolute;
+		bottom: 0;
+		content: "快递配送";
+		font-size: 28rpx;
+		display: block;
+		height: 0;
+		width: 336rpx;
+		border-width: 0 20rpx 80rpx 0;
+		border-style: none solid solid;
+		border-color: transparent transparent #fff;
+		z-index: 2;
+		border-radius: 7rpx 30rpx 0 0;
+		text-align: center;
+		line-height: 80rpx;
+	}
+
+	.order-submission .allAddress .nav .item:nth-of-type(2).on::before {
+		content: "到店核销";
+		border-width: 0 0 80rpx 20rpx;
+		border-radius: 30rpx 7rpx 0 0;
+	}
+
+	.order-submission .allAddress .nav .item.on2 {
+		position: relative;
+	}
+
+	.order-submission .allAddress .nav .item.on2::before {
+		position: absolute;
+		bottom: 0;
+		content: "到店核销";
+		font-size: 28rpx;
+		display: block;
+		height: 0;
+		width: 400rpx;
+		border-width: 0 0 60rpx 60rpx;
+		border-style: none solid solid;
+		border-color: transparent transparent #f7c1bd;
+		border-radius: 40rpx 6rpx 0 0;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.order-submission .allAddress .nav .item:nth-of-type(1).on2::before {
+		content: "快递配送";
+		border-width: 0 60rpx 60rpx 0;
+		border-radius: 6rpx 40rpx 0 0;
+	}
+
+	.order-submission .allAddress .address {
+		height: 150rpx;
+		margin: 0 auto;
+	}
+
+	.order-submission .allAddress .line {
+		margin: 0 auto;
+	}
+
+	.order-submission .wrapper .item .discount .placeholder {
+		color: #ccc;
+		text-align: right;
+	}
+
+	.order-submission .wrapper {
+		margin-bottom: 12rpx;
+		background-color: #fff;
+	}
+
+	.order-submission .wrapper .item {
+		padding: 27rpx 30rpx;
+		font-size: 30rpx;
+		color: #282828;
+	}
+
+	.order-submission .virtual_form {
+		padding: 0 30rpx;
+	}
+
+	/deep/.order-submission .virtual_form .uni-input-wrapper {
+		text-align: right;
+	}
+
+	.order-submission .virtual_form .item-require {
+		color: red;
+		margin-right: 4rpx;
+	}
+
+	.order-submission .virtual_form .item {
+		border-bottom: 1rpx solid #EEEEEE;
+		padding: 27rpx 0;
+	}
+
+	.upload {
+		display: -webkit-box;
+		display: -moz-box;
+		display: -webkit-flex;
+		display: -ms-flexbox;
+		display: flex;
+		-webkit-box-lines: multiple;
+		-moz-box-lines: multiple;
+		-o-box-lines: multiple;
+		-webkit-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		flex-wrap: wrap;
+	}
+
+	.order-submission .virtual_form .pictrue {
+		width: 156rpx;
+		height: 156rpx;
+		margin: 24rpx 20rpx 0 0;
+		position: relative;
+		font-size: 11px;
+		color: #bbb;
+		border-radius: 3rpx;
+
+		&:nth-child(4n) {
+			margin-right: 0;
+		}
+
+		&:nth-last-child(1) {
+			border: 0.5px solid #ddd;
+			box-sizing: border-box;
+		}
+
+		uni-image,
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 1px;
+
+			img {
+				-webkit-touch-callout: none;
+				-webkit-user-select: none;
+				-moz-user-select: none;
+				display: block;
+				position: absolute;
+				top: 0;
+				left: 0;
+				opacity: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.icon-guanbi4 {
+			color: #fff;
+			font-size: 14rpx;
+			position: absolute;
+			top: 0;
+			right: 0;
+			width: 30rpx;
+			height: 30rpx;
+			text-align: center;
+			line-height: 30rpx;
+			border-radius: 0 8rpx 0 8rpx;
+			background: rgba(0, 0, 0, .6);
+		}
+	}
+
+	.vipImg {
+		width: 65rpx;
+		height: 28rpx;
+		margin-left: 4rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+			display: block;
+		}
+	}
+
+	.order-submission .wrapper .item .discount {
+		font-size: 30rpx;
+		color: #999;
+
+		&.discount_voice {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			width: 500rpx;
+			text-align: right;
+		}
+	}
+
+	.order-submission .wrapper .item .discount .iconfont {
+		color: #515151;
+		font-size: 30rpx;
+		margin-left: 15rpx;
+	}
+
+	.order-submission .wrapper .item .discount .num {
+		font-size: 32rpx;
+		margin-right: 20rpx;
+	}
+
+	.order-submission .wrapper .item .shipping {
+		font-size: 30rpx;
+		color: #999;
+		position: relative;
+		padding-right: 58rpx;
+	}
+
+	.order-submission .wrapper .item .shipping .iconfont {
+		font-size: 35rpx;
+		color: #707070;
+		position: absolute;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%);
+		margin-left: 30rpx;
+	}
+
+	.order-submission .wrapper .item input {
+		flex: 1;
+		height: 100%;
+		margin-left: 20rpx;
+		text-align: right;
+	}
+
+	.order-submission .wrapper .item .placeholder {
+		color: #ccc;
+	}
+
+	.order-submission .wrapper .item .list {
+		margin-top: 35rpx;
+	}
+
+	.order-submission .wrapper .item .list .payItem {
+		border: 1px solid #eee;
+		border-radius: 6rpx;
+		height: 86rpx;
+		width: 100%;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.order-submission .wrapper .item .list .payItem.on {
+		border-color: var(--view-theme);
+		color: var(--view-theme);
+	}
+
+	.order-submission .wrapper .item .list .payItem .name {
+		width: 50%;
+		text-align: center;
+		border-right: 1px solid #eee;
+		justify-content: left;
+		padding-left: 80rpx;
+	}
+
+	.order-submission .wrapper .item .list .payItem .name .iconfont {
+		width: 44rpx;
+		height: 44rpx;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 44rpx;
+		background-color: #fe960f;
+		color: #fff;
+		font-size: 30rpx;
+		margin-right: 15rpx;
+	}
+
+	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
+		background-color: #41b035;
+	}
+
+	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-icon34 {
+		background-color: #4295D5;
+	}
+
+	.order-submission .wrapper .item .list .payItem .tip {
+		width: 49%;
+		text-align: center;
+		font-size: 26rpx;
+		color: #aaa;
+	}
+
+	.order-submission .moneyList {
+		margin-top: 12rpx;
+		background-color: #fff;
+		padding: 30rpx;
+	}
+
+	.order-submission .moneyList .item {
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.order-submission .moneyList .item~.item {
+		margin-top: 20rpx;
+	}
+
+	.order-submission .moneyList .item .money {
+		color: #868686;
+	}
+
+	.order-submission .footer {
+		width: 100%;
+		height: 100rpx;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		background-color: #fff;
+		padding: 0 30rpx;
+		font-size: 28rpx;
+		color: #333;
+		box-sizing: border-box;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 30;
+    
+
+		.footer_count {
+			font-size: 28rpx;
+		}
+
+		.coupon_price {
+			color: #999999;
+			font-size: 20rpx;
+			margin-top: 10rpx;
+
+			text {
+				color: #282828;
+				padding: 2rpx 10rpx;
+				background: #F5F5F5;
+				border-radius: 26rpx;
+				margin-left: 20rpx;
+				line-height: 30rpx;
+				height: 30rpx;
+				display: inline-block;
+			}
+		}
+	}
+
+	.pColor {
+		color: var(--view-priceColor);
+	}
+
+	.order-submission .footer .settlement {
+		font-size: 30rpx;
+		color: #fff;
+		width: 240rpx;
+		height: 70rpx;
+		background-color: var(--view-theme);
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 70rpx;
+    flex-shrink: 0;
+
+		&.disabled {
+			background-color: #cccccc;
+		}
+	}
+
+	.footer .transparent {
+		opacity: 0
+	}
+
+	.event_bg {
+		background: #FF7F00;
+	}
+
+	.event_color {
+		color: #FF7F00;
+	}
+
+	.color_red {
+		color: var(--view-theme);
+	}
+
+	.storeinfo-wrapper {
+		.store-item {
+			margin-top: 12rpx;
+			background-color: #fff;
+
+			.store-title {
+				display: flex;
+				align-items: center;
+				padding: 28rpx 30rpx;
+
+				.icon-shangjiadingdan {
+					font-size: 32rpx;
+				}
+
+				.icon-xiangyou {
+					font-size: 26rpx;
+					color: #999;
+				}
+
+				.txt {
+					margin: 0 8rpx;
+				}
+			}
+
+			.product-item {
+				display: flex;
+				padding: 25rpx 30rpx;
+				border-top: 1px solid #F0F0F0;
+
+				.img-box {
+					width: 130rpx;
+					height: 130rpx;
+
+					image {
+						width: 130rpx;
+						height: 130rpx;
+						border-radius: 16rpx;
+					}
+				}
+
+				.content {
+					position: relative;
+					width: 550rpx;
+					margin-left: 30rpx;
+					font-size: 28rpx;
+					color: #282828;
+					overflow: hidden;
+
+					&.event_content {
+						.line1 {
+							width: 360rpx;
+						}
+
+						.price {
+							position: absolute;
+							top: 0;
+							right: 0;
+							margin-top: 0;
+
+							text {
+								display: block;
+								text-align: right;
+							}
+						}
+					}
+
+					.event_name {
+						display: inline-block;
+						margin-right: 9rpx;
+						color: #fff;
+						font-size: 20rpx;
+						padding: 0 8rpx;
+						line-height: 30rpx;
+						text-align: center;
+						border-radius: 6rpx;
+					}
+
+					.event_ship {
+						font-size: 20rpx;
+						margin-top: 10rpx;
+					}
+
+					.label {
+						margin-top: 10rpx;
+						color: #868686;
+						font-size: 20rpx;
+					}
+
+					.price {
+						margin-top: 20rpx;
+						color: var(--view-priceColor);
+						position: relative;
+
+						text {
+							margin-left: 10rpx;
+							color: #999;
+						}
+
+						.delivery_type {
+							float: right;
+
+							text {
+								color: var(--view-priceColor);
+								font-size: 20rpx;
+							}
+
+						}
+					}
+
+					.err-txt {
+						display: flex;
+						align-items: center;
+						margin-top: 18rpx;
+						color: $theme-color;
+
+						.iconfont {
+							margin-right: 10rpx;
+						}
+					}
+
+					.step {
+						position: absolute;
+						right: 0;
+						top: 100rpx;
+						display: flex;
+						align-items: center;
+
+						.min {
+							width: 50rpx;
+							height: 40rpx;
+							background-image: url('~@/static/images/min.png');
+							background-size: 17rpx 17rpx;
+							background-position: center;
+							background-repeat: no-repeat;
+						}
+
+						.num-box {
+							width: 68rpx;
+							height: 40rpx;
+							line-height: 40rpx;
+							text-align: center;
+							background: #F2F2F2;
+							font-size: 23rpx;
+						}
+
+						.add {
+							width: 50rpx;
+							height: 40rpx;
+							background-image: url('~@/static/images/add.png');
+							background-size: 17rpx 17rpx;
+							background-position: center;
+							background-repeat: no-repeat;
+						}
+					}
+				}
+			}
+		}
+
+		.event_payTime {
+			padding: 0 30rpx 24rpx;
+
+			.event_progress {
+				margin-top: 50rpx;
+				position: relative;
+			}
+
+			.progress_step {
+				height: 80rpx;
+				position: relative;
+				padding-left: 60rpx;
+
+				&::before {
+					content: '';
+					display: block;
+					width: 2rpx;
+					height: 40rpx;
+					background: var(--view-theme);
+					position: absolute;
+					left: 35rpx;
+					top: 18rpx;
+				}
+
+				&:nth-child(2) {
+					&::before {
+						bottom: 64rpx;
+						top: auto;
+						background: #EFEFEF;
+					}
+
+					&::after {
+
+						background: #EFEFEF;
+					}
+				}
+
+				&::after {
+					content: '';
+					display: block;
+					width: 14rpx;
+					height: 14rpx;
+					background: var(--view-theme);
+					border-radius: 50%;
+					position: absolute;
+					top: 10rpx;
+					left: 29rpx;
+				}
+
+				.name {
+					float: left;
+					color: #282828;
+
+					&.color_red {
+						color: var(--view-theme);
+					}
+				}
+
+				.price {
+					float: right;
+					color: #282828;
+
+					&.color_red {
+						color: var(--view-priceColor);
+					}
+				}
+			}
+
+			.progress_pay {
+				padding-left: 60rpx;
+				font-size: 24rpx;
+				color: #868686;
+				margin-top: -34rpx;
+			}
+		}
+	}
+
+	.integral_checked {
+		margin-left: 10rpx;
+		position: relative;
+		top: -2rpx;
+		display: inline;
+	}
+
+	uni-checkbox-group,
+	.checkgroup {
+		width: 100%;
+
+		.checkbox {
+			float: right;
+		}
+	}
+
+	.icon-wenhao1 {
+		color: #868686;
+		margin-right: 6rpx;
+	}
+
+	.total {
+		display: flex;
+		justify-content: flex-end;
+		padding-right: 30rpx;
+		padding-bottom: 30rpx;
+		font-size: 26rpx;
+		color: #282828;
+
+		.price {
+			margin-left: 10rpx;
+			color: var(--view-priceColor);
+			font-size: 28rpx;
+			font-weight: bold;
+
+			text {
+				font-size: 20rpx;
+			}
+		}
+	}
+
+	.store-address {
+		padding: 30rpx 23rpx;
+		margin: 0 30rpx;
+		background: #F6F6F6;
+		border-radius: 8rpx;
+		font-size: 24rpx;
+		display: -webkit-box;
+		display: -moz-box;
+		display: -ms-flexbox;
+		display: -webkit-flex;
+		display: flex;
+		/*垂直居中*/
+		-webkit-box-align: center;
+		/*旧版本*/
+		-moz-box-align: center;
+		/*旧版本*/
+		-ms-flex-align: center;
+		/*混合版本*/
+		-webkit-align-items: center;
+		/*新版本*/
+		align-items: center;
+
+		/*新版本*/
+		.name {
+			width: 148rpx;
+			margin-right: 20rpx;
+		}
+
+		.info {
+			flex: 1;
+		}
+
+		.map {
+			text-align: center;
+			padding-left: 40rpx;
+			position: relative;
+
+			&::before {
+				content: '';
+				display: inline-block;
+				width: 2rpx;
+				height: 42rpx;
+				background-color: #DDDDDD;
+				position: absolute;
+				left: 0;
+				top: 18rpx;
+			}
+
+			.iconfont {
+				color: var(--view-theme);
+			}
+
+			.map_text {
+				color: var(--view-theme);
+			}
+		}
+	}
+
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, .5);
+		z-index: 40;
+	}
+
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 656rpx;
+		height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		border-radius: 12rpx;
+		-webkit-border-radius: 12rpx;
+		padding: 52rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+
+	.settlementAgreement .setAgCount .content {
+		margin-top: 32rpx;
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		height: 756rpx;
+		overflow-y: scroll;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/order_list/indexOther.vue b/pages/users/order_list/indexOther.vue
new file mode 100644
index 0000000..021b4a8
--- /dev/null
+++ b/pages/users/order_list/indexOther.vue
@@ -0,0 +1,1333 @@
+	<template>
+		<view :style="viewColor">
+
+			<view class='my-order'>
+				<view class='header'>
+
+					<view class='picTxt acea-row row-between-wrapper'>
+						<view class='text'>
+							<view class='name'>赊账订单信息</view>
+							<view>总订单：{{orderData.orderCount || 0}} 总金额：￥{{orderData.orderPrice || 0}}</view>
+						</view>
+						<view class='pictrue'>
+							<image :src="`${domain}/static/images/orderTime.png`"></image>
+						</view>
+					</view>
+				</view>
+				<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
+					<text class="iconfont icon-sousuo"></text>
+					搜索我的订单
+				</navigator>
+				<view class='nav acea-row row-around'>
+					<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+						<view>全部</view>
+						<view class='num'>{{orderData.orderCount+len || 0}}</view>
+					</view>
+					<!-- <view class='item' :class='orderStatus==1? "on": ""' @click="statusClick(1)">
+						<view>待付款</view>
+						<view class='num'>{{orderData.noPay || 0}}</view>
+					</view> -->
+					<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+						<view>待发货</view>
+						<view class='num'>{{orderData.noPostage || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==3? "on": ""' @click="statusClick(3)">
+						<view>待收货</view>
+						<view class='num '>{{orderData.noDeliver || 0}}</view>
+					</view>
+					<!-- <view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
+						<view>待评价</view>
+						<view class='num'>{{orderData.noComment || 0}}</view>
+					</view> -->
+					<!-- <view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)">
+						<view>售后/退款</view>
+						<view class='num'>{{len || 0}}</view>
+					</view> -->
+				</view>
+				<!--定金预售订单-->
+				<view v-if="presellProList.length > 0" class="event_container">
+					<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
+						<view class="info">
+							<view class="title">预售尾款订单转到这里了！</view>
+							<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看
+							</view>
+						</view>
+						<view class="photo acea-row row-between">
+							<view class='picture'>
+								<image
+									:src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'>
+								</image>
+							</view>
+							<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
+						</view>
+					</navigator>
+				</view>
+				<view class='list'>
+					<!-- 代付款 -->
+					<view v-if="orderList.length > 0">
+						<block v-if="orderStatus == 0">
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.group_order_id, item)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper">
+											{{item.group_order_sn}}
+										</view>
+										<view class='t-color'>
+											{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+										</view>
+									</view>
+									<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
+										<!--预售-->
+										<view v-if="order.activity_type === 2">
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+														<view class='name line1'>
+															<text
+																class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+															<view class="event_ship event_color">发货时间：
+																<!--全款预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 1">
+																	{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+																</text>
+																<!--定金预售-->
+																<text
+																	v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															</view>
+														</view>
+														<view class='money'>
+															<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
+															</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+													<view v-if="goods.cart_info.productPresell.presell_type === 2"
+														class="event_price">
+														定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
+														尾款待支付 <text
+															class="t-color">￥{{ order.presellOrder.pay_price }}</text>
+													</view>
+												</view>
+											</block>
+										</view>
+										<view v-else>
+											<block v-for="(goods,g) in order.orderProduct">
+												<view class='item-info acea-row row-between row-top'>
+													<view class='pictrue'>
+														<image
+															:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+														</image>
+													</view>
+													<view class='text acea-row row-between'>
+
+														<view class='name line2'>{{goods.cart_info.product.store_name}}
+														</view>
+
+														<view class='money' v-if="item.orderList[0].activity_type == 4">
+															<view v-if="goods.cart_info.activeSku">
+																￥{{goods.cart_info.activeSku.active_price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+														<view v-else class='money'>
+															<view>￥{{goods.cart_info.productAttr.price}}</view>
+															<view>x{{goods.product_num}}</view>
+														</view>
+													</view>
+												</view>
+											</block>
+										</view>
+									</view>
+									 
+									<view class='bottom acea-row row-right row-middle'>
+										<view class='bnt b-color'
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											立即付款</view>
+									</view>
+								</view>
+							</view>
+						</block>
+						<!-- 待发货 待收货 待评价 已完成 -->
+						<block v-else>
+							<view class='item' v-for="(item,index) in orderList" :key="index">
+								<view @click='goOrderDetails(item.order_id, item)'>
+									<view class='title acea-row row-between-wrapper'>
+										<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+											<text class="iconfont icon-shangjiadingdan"></text>
+											<view class="store-name">{{item.merchant.mer_name}}</view>
+											<text class="iconfont icon-xiangyou"></text>
+										</view>
+
+										<view v-if="item.order_status ==7" class='t-color'>
+											<text
+												v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
+											<!-- <text v-else>待发货</text> -->
+										</view>
+
+
+										<view v-if="item.order_status == 2 " class='t-color'>待发货</view>
+										<view v-if="item.order_status == 1 " class='t-color'>待付款</view>
+										<view v-if="item.order_status == 3" class='t-color'>待收货</view>
+										<view v-if="item.order_status == 4" class='t-color'>待评价
+										</view>
+										<view v-if="item.order_status == 5" class='t-color'>已完成</view>
+										<view v-if="item.order_status == 6" class='t-color'>已退款</view>
+										<view v-if="item.order_status == 8 && item.pay_type == 8" class='t-color'>待结算
+										</view>
+										<view v-if="item.order_status == 9" class='t-color'>待商家确认</view>
+									</view>
+									<view v-if="item.activity_type === 2">
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
+														<text
+															class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+														<view v-if="item.status == 0" class="event_ship event_color">发货时间：
+															<!--全款预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+															<!--定金预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														</view>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money'>
+													<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+											</view>
+										</view>
+									</view>
+									<view v-else>
+										<view class='item-info acea-row row-between row-top'
+											v-for="(goods,index) in item.orderProduct" :key="index">
+											<view class='pictrue'>
+												<image
+													:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+												</image>
+											</view>
+											<view class='text acea-row row-between'>
+												<view class='name '>
+													<view class='name line2'>
+														<text>{{goods.cart_info.product.store_name}}</text>
+													</view>
+													<view style="margin-top: 10rpx;" class="t-color">
+														{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+													</view>
+												</view>
+												<view class='money' v-if="item.activity_type == 3">
+													<view v-if="goods.cart_info.productAssistAttr">
+														￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else-if="item.activity_type == 4">
+													<view v-if="goods.cart_info.activeSku">
+														￥{{goods.cart_info.activeSku.active_price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view class='money' v-else>
+													<view>￥{{goods.cart_info.productAttr.price}}</view>
+													<view>x{{goods.product_num}}</view>
+												</view>
+												<view v-if="item.pay_type==8" style="text-align: right;width: 100%;font-size: 14px;">先货后款 实付:￥0.00</view>
+											</view>
+										</view>
+									</view>
+									<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.presell_price}}</text>
+									</view>
+                  <view class='totalPrice' v-else-if="item.pay_type==8">共{{item.orderNum || 0}}件商品，结算周期到期后付款
+                  	<text class='money p-color'>￥{{item.pay_price}}</text>
+                  </view>
+									<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
+										<text class='money p-color'>￥{{item.pay_price}}</text>
+									</view>
+								</view>
+								<view class='bottom acea-row row-right row-middle'>
+									<!-- <view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+										@click.stop='applyInvoice(item.order_id)'>申请开票</view> -->
+									<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id, item)'>查看详情</view>
+									</block>
+									<block v-if="item.status == 1">
+										<view class='bnt cancelBnt'
+											v-if="item.delivery_type == 1 || item.delivery_type == 2"
+											@click='goOrderDetails(item.order_id)'>查看物流</view>
+										<view class='bnt b-color' @tap='confirmOrder(item,index)'
+											v-if='item.activity_type==98&&item.pay_type==8'>
+											确认收货
+										</view>
+										<view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view>
+									</block>
+
+									<block v-if="item.order_status == 1 ">
+
+										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
+											去付款
+										</view>
+										<view class='bnt b-color' v-else
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去付款
+										</view>
+									</block>
+									<block v-if="item.order_status == 9 ">
+
+										<view class='bnt b-color' v-if="item.status==12" @click.stop='dePay'>
+											去付款
+										</view>
+										<view class='bnt b-color' v-else
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去付款
+										</view>
+									</block>
+									<block v-if="item.status == 2 ">
+										<!-- 	<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+
+										<!-- <view class='bnt b-color' v-if="item.order_status==8"
+											@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
+											去结算
+										</view> -->
+                    <view class='bnt b-color' v-if="item.order_status==8"
+                    	@click.stop='navToPay(item)'>
+                    	去结算
+                    </view>
+										<view v-else class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>
+											去评价
+										</view>
+									</block>
+									<block v-if="item.status == 3">
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
+											v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
+											查看详情</view>
+										<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator> -->
+										<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
+									</block>
+								</view>
+							</view>
+						</block>
+					</view>
+				</view>
+				<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
+				<view v-if="orderList.length == 0 && page > 1">
+					<emptyPage title="暂无订单~"></emptyPage>
+				</view>
+			</view>
+			<!-- <home></home> -->
+			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+			<payment :payMode='payMode' :pay_close="pay_close" :order_type='order_type' @onChangeFun='onChangeFun'
+				:order_id="pay_order_id" :totalPrice='totalPrice'></payment>
+
+
+			<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+			<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
+				<view class="warp">
+					<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+					<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
+				</view>
+				<view class="textp">
+					<h3>确认收到货了吗?</h3>
+					<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
+					<button class="shouhuobtn" @click="queding()">
+
+						确认
+					</button>
+					<view class="cle" @click="close">取消</view>
+				</view>
+			</u-popup>
+		</view>
+	</template>
+
+	<script>
+		// +----------------------------------------------------------------------
+		// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+		// +----------------------------------------------------------------------
+		// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+		// +----------------------------------------------------------------------
+		// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+		// +----------------------------------------------------------------------
+		// | Author: CRMEB Team <admin@crmeb.com>
+		// +----------------------------------------------------------------------
+		let app = getApp();
+		import {
+			getOrderList,
+      getOtherOrderList,
+			orderData,
+      otherOrderData,
+			unOrderCancel,
+			orderDel,
+			orderPay,
+			groupOrderList,
+			orderTake,
+      otherOrderTake,
+			applyInvoiceApi,
+			refundList
+		} from '@/api/order.js';
+		import {
+			getUserInfo
+		} from '@/api/user.js';
+		import {
+			openOrderSubscribe
+		} from '@/utils/SubscribeMessage.js';
+		import payment from '@/components/payment';
+		import home from '@/components/home/index.vue';
+		import addInvoicing from '@/components/addInvoicing';
+		import {
+			mapGetters
+		} from "vuex";
+		import authorize from '@/components/Authorize';
+		import emptyPage from '@/components/emptyPage.vue';
+		import {
+			configMap
+		} from '@/utils'
+		import {
+			HTTP_REQUEST_URL
+		} from '@/config/app';
+		export default {
+			components: {
+				payment,
+				emptyPage,
+				home,
+				authorize,
+				addInvoicing
+			},
+			data() {
+				return {
+					loading: false, //是否加载中
+					loadend: false, //是否加载完毕
+					loadTitle: '加载更多', //提示语
+					orderList: [], //订单数组
+					presellProList: [], //定金预售订单
+					presellOrderCount: 0,
+					orderData: {}, //订单详细统计
+					orderStatus: 0, //订单状态
+					page: 1,
+					limit: 20,
+					receivingshow: false,
+					domain: HTTP_REQUEST_URL,
+					order_type: 0,
+					payMode: [{
+							name: "微信支付",
+							icon: "icon-weixinzhifu",
+							value: 'wechat',
+							title: '微信快捷支付',
+							payStatus: 1
+						},
+						{
+							name: "支付宝支付",
+							icon: "icon-zhifubao",
+							value: 'alipay',
+							title: '支付宝支付',
+							payStatus: this.$store.getters.globalData.alipay_open
+						},
+						{
+							name: "余额支付",
+							icon: "icon-yuezhifu",
+							value: 'balance',
+							title: '可用余额:',
+							number: 0,
+							payStatus: this.$store.getters.globalData.yue_pay_status
+						}
+					],
+					pay_close: false,
+					pay_order_id: '',
+					invoice_order_id: '',
+					totalPrice: '0',
+					order_id: 0,
+					isAuto: false, //没有授权的不会自动授权
+					isShowAuth: false, //是否隐藏授权
+					isReady: true,
+					invoice: {
+						invoice: false,
+						add: false,
+					},
+					len: 0,
+          product_type: 98
+				};
+			},
+			computed: {
+				...mapGetters(['isLogin', 'viewColor']),
+				...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
+			},
+			watch: {
+				alipay_open(n) {
+					this.payMode[1].payStatus = n
+				},
+				yue_pay_status(n) {
+					this.payMode[2].payStatus = n
+				}
+			},
+			onShow() {
+				if (this.isLogin) {
+					this.page = 1;
+					this.loadend = false;
+					this.loading = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+					// this.getpreSellOrderList();
+				} else {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}
+			},
+      onLoad(options) {
+        if(options.product_type)this.product_type = options.product_type
+      },
+			onReady() {},
+			mounted: function() {
+				this.arrlist()
+			},
+			methods: {
+				arrlist() {
+					refundList({
+						product_type: this.product_type,
+						type: 0,
+						page: 1,
+						limit: 1500
+
+					}).then(res => {
+						this.len = res.data.list.length
+					})
+				},
+				// 后退
+				returns() {
+					uni.navigateBack()
+				},
+				// 首页
+				goHome() {
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+				},
+				// 去商铺
+				goMall(item) {
+					if (this.hide_mer_status == 0) {
+						uni.navigateTo({
+							url: '/pages/store/home/index?id=' + item.mer_id
+						})
+					}
+				},
+        // 先货后款去支付
+        navToPay(item){
+          uni.navigateTo({
+            url: `/pages/users/payment/payment?order_id=${item.group_order_id}&product_type=${item.orderProduct[0]?.product_type||''}`
+          })
+        },
+				onLoadFun() {
+					this.isShowAuth = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+				},
+				// 授权关闭
+				authColse: function(e) {
+					this.isShowAuth = e
+				},
+				/**
+				 * 事件回调
+				 *
+				 */
+				onChangeFun: function(e) {
+					let opt = e;
+					let action = opt.action || null;
+					let value = opt.value != undefined ? opt.value : null;
+					(action && this[action]) && this[action](value);
+				},
+				/**
+				 * 获取用户信息
+				 *
+				 */
+				getUserInfo: function() {
+					let that = this;
+					getUserInfo().then(res => {
+						that.payMode[2].number = res.data.now_money;
+						// that.$set(that, 'payMode', that.payMode);
+					});
+				},
+				/**
+				 * 关闭支付组件
+				 *
+				 */
+				payClose: function() {
+					this.pay_close = false;
+				},
+				/**
+				 * 生命周期函数--监听页面加载
+				 */
+				onLoad: function(options) {
+					if (options.status) this.orderStatus = options.status;
+				},
+				/**
+				 * 获取订单统计数据
+				 *
+				 */
+				getOrderData: function() {
+					let that = this;
+					otherOrderData({
+						product_type: this.product_type
+					}).then(res => {
+						// console.log(res.data)
+						that.$set(that, 'orderData', res.data);
+					})
+				},
+				/**
+				 * 取消订单
+				 *
+				 */
+				cancelOrder: function(index, order_id) {
+					let that = this;
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法取消订单'
+					});
+					unOrderCancel(order_id).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+							icon: 'success'
+						}, function() {
+							that.orderList.splice(index, 1);
+							that.$set(that, 'orderList', that.orderList);
+							that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+							that.getOrderData();
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+				},
+				/**
+				 * 打开支付组件
+				 *
+				 */
+				goPay: function(pay_price, order_id, order_type) {
+					this.$set(this, 'pay_close', true);
+					this.order_id = order_id;
+					this.pay_order_id = order_id.toString()
+					this.$set(this, 'totalPrice', pay_price);
+					this.order_type = order_type
+				},
+				/**
+				 * 支付成功回调
+				 *
+				 */
+				pay_complete: function() {
+					this.loadend = false;
+					this.page = 1;
+					this.$set(this, 'orderList', []);
+					this.pay_close = false;
+					this.pay_order_id = '';
+					this.getOrderData();
+					this.getOrderList();
+				},
+				/**
+				 * 支付失败回调
+				 *
+				 */
+				pay_fail: function() {
+					this.pay_close = false;
+					this.pay_order_id = '';
+				},
+				/**
+				 * 去订单详情
+				 */
+				goOrderDetails: function(order_id, item) {
+
+
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情'
+					});
+					// #ifdef MP
+					uni.showLoading({
+						title: '正在加载',
+					})
+					console.log(self.orderStatus)
+					openOrderSubscribe().then(() => {
+						uni.hideLoading();
+						if (self.orderStatus == 0||(item&&item.order_status==1)) {
+							uni.navigateTo({
+								url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}`
+							})
+						} else {
+							uni.navigateTo({
+								url: `/pages/order_details/indexOther?order_id=${order_id}` 
+							})
+						}
+					}).catch(() => {
+						uni.hideLoading();
+					})
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0||(item&&item.order_status==1)) {
+						uni.navigateTo({
+							url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}`
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pages/order_details/indexOther?order_id=${order_id}` 
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 提示
+				 */
+				dePay() {
+
+					uni.showModal({
+						title: '提示',
+						title: '该订单属于先货后款的订单，等商户确认后才能支付',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+
+				},
+				/**
+				 * 点击去评价
+				 */
+				goOrderDetails_Evaluation: function(order_id) {
+					let self = this
+					if (!order_id) return that.$util.Tips({
+						title: '缺少订单号无法查看订单详情和评价'
+					});
+					// #ifdef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/indexOther?order_id=' + order_id
+						})
+					}
+					// #endif
+					// #ifndef MP
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/indexOther?order_id=' + order_id
+						})
+					}
+					// #endif
+				},
+				/**
+				 * 切换类型
+				 */
+				statusClick: function(status) {
+
+					if (status == 5) {
+						uni.navigateTo({
+							url: '/pages/users/refund/list?type='+this.product_type
+						})
+					} else {
+						if (status == this.orderStatus) return;
+						this.orderStatus = status;
+						this.loadend = false;
+						this.loading = false;
+						this.page = 1;
+						this.$set(this, 'orderList', []);
+						this.getOrderList();
+					}
+				},
+				/**
+				 * 获取订单列表
+				 */
+				getOrderList: function() {
+					let that = this;
+					if (that.loadend) return;
+					if (that.loading) return;
+					that.loading = true;
+					that.loadTitle = "加载更多";
+					if (that.isReady) {
+						that.isReady = false
+						if (that.orderStatus == 0) {
+							groupOrderList({
+								page: that.page,
+								limit: that.limit,
+								product_type: this.product_type
+							}).then(res => {
+								that.isReady = true;
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								// console.log(that.orderList)
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								// console.log(that.orderList)
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1
+							})
+						} else {
+							let arr;
+							if (that.orderStatus > -1) {
+								arr = that.orderStatus
+							} else {
+								arr = ''
+							}
+							getOtherOrderList({
+								status: arr,
+								page: that.page,
+								limit: that.limit,
+								product_type: this.product_type
+							}).then(res => {
+								let list = res.data.list || [];
+								let loadend = list.length < that.limit;
+								that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+									.orderList);
+								that.$set(that, 'orderList', that.orderList);
+								that.getProductCount();
+								that.loadend = loadend;
+								that.loading = false;
+								that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+								that.page = that.page + 1;
+								that.isReady = true;
+							}).catch(err => {
+								that.loading = false;
+								that.loadTitle = "加载更多";
+							})
+						}
+					}
+				},
+				/**
+				 * 获取定金预售订单列表
+				 */
+				getpreSellOrderList: function() {
+					let that = this;
+					getOrderList({
+						status: 10,
+						page: 1,
+						limit: 1,
+					}).then(res => {
+						let list = res.data.list || [];
+						that.presellOrderCount = res.data.count;
+						that.$set(that, 'presellProList', list);
+					})
+				},
+				/**
+				 * 获取单个订单商品数量
+				 */
+				getProductCount: function() {
+					if (this.orderStatus !== 0) {
+						this.orderList.forEach((item, i) => {
+							let orderNum = 0
+							if (item.orderProduct) {
+								item.orderProduct.forEach((val) => {
+									orderNum += val.product_num
+								})
+								this.orderList[i]['orderNum'] = orderNum;
+							}
+						})
+					}
+				},
+				/**
+				 * 删除订单
+				 */
+				delOrder: function(order_id, index) {
+					let that = this;
+					orderDel(order_id).then(res => {
+						that.orderList.splice(index, 1);
+						that.$set(that, 'orderList', that.orderList);
+						that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+						that.getOrderData();
+						return that.$util.Tips({
+							title: '删除成功',
+							icon: 'success'
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				},
+				close() {
+					this.receivingshow = false
+				},
+				//收货弹窗
+				confirmOrder: function(item) {
+					console.log(item)
+					this.order_id = item.order_id
+					this.receivingshow = true
+
+				},
+				queding() {
+
+					let that = this;
+					otherOrderTake(that.order_id).then(res => {
+						this.receivingshow = false
+						return that.$util.Tips({
+							title: '成功收货',
+							icon: 'success'
+						}, function() {
+
+							that.getOrderInfo();
+						});
+					}).catch(err => {
+						this.receivingshow = false
+						return that.$util.Tips({
+							title: err
+						});
+					})
+
+
+
+				},
+
+				// 确认收货
+				confirmOrdera: function(item, index) {
+					let that = this;
+					uni.showModal({
+						title: '确认收货',
+						content: '为保障权益，请收到货确认无误后，再确认收货',
+						success: function(res) {
+							if (res.confirm) {
+								otherOrderTake(item.order_id).then(res => {
+									return that.$util.Tips({
+										title: '操作成功',
+										icon: 'success'
+									}, function() {
+										that.orderList.splice(index, 1);
+										that.getOrderData();
+									});
+								}).catch(err => {
+									return that.$util.Tips({
+										title: err
+									});
+								})
+							}
+						}
+					})
+				},
+				/*申请开票*/
+				applyInvoice(order_id) {
+					let that = this;
+					that.invoice_order_id = order_id
+					that.invoice.invoice = true;
+					that.$refs.addInvoicing.getInvoiceDefault();
+					that.$refs.addInvoicing.getInvoiceList();
+				},
+				// 关闭发票弹窗
+				changeInvoiceClose: function(data) {
+					if (data) this.getInvoiceData(data);
+					this.$set(this.invoice, 'invoice', false);
+				},
+				// 开票回调
+				getInvoiceData(data) {
+					let that = this
+					applyInvoiceApi(that.invoice_order_id, data).then(res => {
+						return that.$util.Tips({
+							title: res.message,
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					})
+				}
+			},
+			onReachBottom: function() {
+				this.getOrderList();
+			}
+		}
+	</script>
+
+	<style scoped lang="scss">
+		.warp {
+			margin: auto;
+
+			.guanbi {
+				position: absolute;
+				right: 0px;
+				top: 120rpx;
+				z-index: 1;
+				width: 30px;
+				height: 30px;
+			}
+		}
+
+		.textp {
+			width: 320px;
+			padding-bottom: 20px;
+			position: absolute;
+			top: 110px;
+			border-radius: 10px;
+
+			span {
+				display: block;
+				width: 280px;
+				padding-top: 20px;
+				margin: auto;
+			}
+
+			h3 {
+				text-align: center;
+			}
+
+			.shouhuobtn {
+				margin: auto;
+				line-height: 54px;
+				margin-top: 30px;
+				width: 191px;
+				height: 54px;
+				color: white;
+				background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+				border-radius: 27px 27px 27px 27px;
+			}
+
+			.cle {
+				margin: auto;
+				text-align: center;
+				margin-top: 15px;
+				height: 40px;
+				background-color: #FFFFFF;
+				border-radius: 10px;
+				color: #999999;
+			}
+		}
+
+		.head-menu {
+			height: 50rpx;
+			padding-left: 20rpx;
+			line-height: 50rpx;
+			font-weight: bold;
+		}
+
+		.my-order .header {
+			height: 260rpx;
+			padding: 0 30rpx;
+			background-color: var(--view-theme);
+		}
+
+		.t-color {
+			color: var(--view-theme);
+		}
+
+		.p-color {
+			color: var(--view-priceColor);
+		}
+
+		.b-color {
+			background-color: var(--view-theme);
+		}
+
+		.my-order .header .picTxt {
+			height: 190rpx;
+		}
+
+		.my-order .header .picTxt .text {
+			color: rgba(255, 255, 255, 0.8);
+			font-size: 26rpx;
+			// font-family: 'Guildford Pro';
+		}
+
+		.my-order .header .picTxt .text .name {
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #fff;
+			margin-bottom: 20rpx;
+		}
+
+		.my-order .header .picTxt .pictrue {
+			width: 122rpx;
+			height: 109rpx;
+		}
+
+		.my-order .header .picTxt .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.my-order .nav {
+			background-color: #fff;
+			width: 690rpx;
+			height: 140rpx;
+			border-radius: 16rpx;
+			margin: 20rpx auto 0 auto;
+		}
+
+		.my-order .nav .item {
+			text-align: center;
+			font-size: 26rpx;
+			color: #282828;
+			padding: 29rpx 0;
+		}
+
+		.my-order .nav .item.on {
+			font-weight: bold;
+			border-bottom: 5rpx solid var(--view-theme);
+		}
+
+		.my-order .nav .item .num {
+			margin-top: 18rpx;
+		}
+
+		.my-order .list {
+			width: 690rpx;
+			margin: 14rpx auto 0 auto;
+		}
+
+		.my-order .list .item {
+			background-color: #fff;
+			border-radius: 16rpx;
+			margin-bottom: 14rpx;
+		}
+
+		.my-order .list .item .title {
+			height: 84rpx;
+			padding: 0 30rpx;
+			border-bottom: 1px solid #eee;
+			font-size: 28rpx;
+			color: #282828;
+
+			.left-wrapper {
+				.iconfont {
+					margin-top: 5rpx;
+				}
+
+				.store-name {
+					margin: 0 10rpx;
+				}
+
+				.icon-xiangyou {
+					font-size: 20rpx;
+				}
+			}
+		}
+
+		.my-order .list .item .title .sign {
+			font-size: 24rpx;
+			padding: 0 7rpx;
+			height: 36rpx;
+			margin-right: 15rpx;
+		}
+
+		.my-order .list .item .item-info {
+			padding: 0 30rpx;
+			margin-top: 22rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue {
+			width: 120rpx;
+			height: 120rpx;
+		}
+
+		.my-order .list .item .item-info .pictrue image {
+			width: 100%;
+			height: 100%;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text {
+			width: 486rpx;
+			font-size: 28rpx;
+			color: #999;
+			margin-top: 6rpx;
+		}
+
+		.my-order .list .item .item-info .text .name {
+			width: 320rpx;
+			color: #282828;
+		}
+
+		.event_bg {
+			background: #FF7F00;
+		}
+
+		.event_color {
+			color: #FF7F00;
+		}
+
+		.my-order .list .item .event_name {
+			display: inline-block;
+			margin-right: 9rpx;
+			color: #fff;
+			font-size: 20rpx;
+			padding: 0 8rpx;
+			line-height: 30rpx;
+			text-align: center;
+			border-radius: 6rpx;
+		}
+
+		.my-order .list .item .event_ship {
+			font-size: 20rpx;
+			margin-top: 10rpx;
+		}
+
+		.my-order .list .event_price {
+			margin: 0 0 50rpx 120rpx;
+		}
+
+		.my-order .list .item .item-info .text .money {
+			text-align: right;
+		}
+
+		.my-order .list .item .totalPrice {
+			font-size: 26rpx;
+			color: #282828;
+			text-align: right;
+			margin: 27rpx 0 0 30rpx;
+			padding: 0 30rpx 30rpx 0;
+		}
+
+		.my-order .list .item .totalPrice .money {
+			font-size: 28rpx;
+			font-weight: bold;
+		}
+
+		.my-order .list .item .bottom {
+			height: 107rpx;
+			padding: 0 30rpx;
+			border-top: 1px solid #f0f0f0;
+		}
+
+		.my-order .list .item .bottom .bnt {
+			width: 176rpx;
+			height: 60rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			border-radius: 50rpx;
+			font-size: 27rpx;
+		}
+
+		.my-order .list .item .bottom .bnt.cancelBnt {
+			border: 1px solid #ddd;
+			color: #aaa;
+		}
+
+		.my-order .list .item .bottom .bnt.colorBnt {
+			border: 1px solid var(--view-theme);
+			color: var(--view-theme);
+		}
+
+		.my-order .list .item .bottom .bnt .icon-fabu {
+			font-size: 26rpx;
+			margin-right: 10rpx;
+		}
+
+		.my-order .list .item .bottom .bnt~.bnt {
+			margin-left: 17rpx;
+		}
+
+		.noCart {
+			margin-top: 171rpx;
+			padding-top: 0.1rpx;
+		}
+
+		.noCart .pictrue {
+			width: 414rpx;
+			height: 336rpx;
+			margin: 78rpx auto 56rpx auto;
+		}
+
+		.noCart .pictrue image {
+			width: 100%;
+			height: 100%;
+		}
+
+		.event_container {
+			width: 690rpx;
+			background-image: url(../static/images/presell_orderBg.png);
+			background-size: cover;
+			background-repeat: no-repeat;
+			margin: 20rpx auto;
+			padding: 26rpx 30rpx;
+			border-radius: 16rpx;
+
+			.info {
+				width: 420rpx;
+
+				.title {
+					color: #282828;
+					font-size: 26rpx;
+				}
+
+				.desc {
+					color: #999;
+					font-size: 24rpx;
+					margin-top: 30rpx;
+				}
+			}
+
+			.photo {
+				width: 180rpx;
+
+				.picture {
+					width: 120rpx;
+					height: 120rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 8rpx;
+					}
+				}
+
+				.more_btn {
+					color: #fff;
+					background: #F97E3B;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 40rpx;
+					text-align: center;
+					line-height: 40rpx;
+					position: relative;
+					top: 40rpx;
+
+					text {
+						font-size: 20rpx;
+					}
+				}
+			}
+		}
+
+		.search {
+			height: 70rpx;
+			padding: 0 30rpx;
+			border-radius: 35rpx;
+			margin: -35rpx 30rpx 0;
+			background-color: #FFFFFF;
+			font-size: 26rpx;
+			color: #999999;
+
+			.iconfont {
+				margin-right: 10rpx;
+				font-size: 23rpx;
+			}
+		}
+	</style>
\ No newline at end of file
diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
index faffca9..09101e9 100644
--- a/pages/users/supply_procurement/index.vue
+++ b/pages/users/supply_procurement/index.vue
@@ -21,12 +21,12 @@
     <view class="con_kuo"
     v-for="(item, index) in list"
     :key="item.value"
-    	@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
-    	<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
+    	@click="navigator(`/pages/nongKe/cloud_entrepot/${item.name=='现款现货'?'indexb':'indexOther'}?type_id=12&value=${item.value}&tips=${item.content}`)">
+    	<image class="con_img" :src="item.bg" mode=""></image>
     	<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
     	<view class="con_text">
     		<h3>{{item.name}}</h3>
-    		<span>先付款后发货</span>
+    		<span>{{item.content}}</span>
     	</view>
     </view>
 	</view>
@@ -50,9 +50,25 @@
         systemGroupValue({
           name: 'purchasing_navigation'
         }).then(res=>{
-          console.log(res);
+          res.data.forEach((item)=>{
+            if(item.name=='线上铺货'){
+              item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/71e06202312151146467207.png';
+              item.content = '线上选品 一键铺货';
+            }
+            if(item.name=='实体铺货'){
+              item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/8cb7a202312151147485701.png';
+              item.content = '先售利润 后结货款';
+            }
+            if(item.name=='现款现货'){
+              item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f4521202312151148087081.png';
+              item.content = '先付款 后发货';
+            }
+            if(item.name=='赊账进货'){
+              item.bg = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/899a4202312151148319478.png';
+              item.content = '先发货 后付款';
+            }
+          })
           this.list = res.data;
-          console.log(this.list);
         })
       },
 			navigator(url, t) {
@@ -73,7 +89,7 @@
 	.conent {
 		width: 100%;
 		display: flex;
-		justify-content: space-around;
+		justify-content: space-evenly;
     flex-wrap: wrap;
 		margin-top: 20px;
 
@@ -81,13 +97,13 @@
 			position: relative;
 
 			.con_img {
-				width: 192px;
+				width: 360rpx;
 				height: 92px;
 			}
 
 			.con_ico {
 				position: absolute;
-				left: 25px;
+				left: 15px;
 				top: 32px;
 				width: 31px;
 				height: 32px;
@@ -95,7 +111,7 @@
 
 			.con_text {
 				position: absolute;
-				left: 66px;
+				left: 55px;
 				top: 20px;
 				color: white;
 			}