diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
index 4fbafa4d8..4b520501f 100644
--- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
+++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
@@ -374,7 +374,7 @@ export default {
     shippingRegion() {
       logistics.shippingRegion({ tempId: this.tempId }).then(res => {
         res.data.forEach((item, index) => {
-          item.title = JSON.parse(item.title)
+          // item.title = JSON.parse(item.title)
           item.city_ids = item.title
         })
         this.ruleForm.region = res.data
diff --git a/yudao-ui-app/.hbuilderx/launch.json b/yudao-ui-app/.hbuilderx/launch.json
new file mode 100644
index 000000000..ee5be7746
--- /dev/null
+++ b/yudao-ui-app/.hbuilderx/launch.json
@@ -0,0 +1,20 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/yudao-ui-app/api/api.js b/yudao-ui-app/api/api.js
index 017325e3e..7432f97f3 100644
--- a/yudao-ui-app/api/api.js
+++ b/yudao-ui-app/api/api.js
@@ -67,7 +67,7 @@ export function setCouponReceive(couponId) {
  * @param object data
  */
 export function getCoupons(data) {
-  return request.get('coupons', data, {
+  return request.get('front/coupons', data, {
     noAuth: true
   })
 }
diff --git a/yudao-ui-app/api/order.js b/yudao-ui-app/api/order.js
index ef7768b91..6dd877ae4 100644
--- a/yudao-ui-app/api/order.js
+++ b/yudao-ui-app/api/order.js
@@ -12,7 +12,7 @@ export function getCartCounts(numType,type) {
  *
  */
 export function getCartList(data) {
-	return request.get("cart/list", data);
+	return request.get("front/cart/list", data);
 }
 
 /**
@@ -21,19 +21,21 @@ export function getCartList(data) {
  * @param int number 修改数量
  */
 export function changeCartNum(cartId, number) {
-	return request.post("cart/num", {
-		id: cartId,
-		number: number
-	}, {}, 1);
+	return request.post("front/cart/num?id=" + cartId + "&number="+number)
 }
+// export function changeCartNum(cartId, number) {
+// 	return request.post("front/cart/num", {
+// 		id: cartId,
+// 		number: number
+// 	}, {},);
+// }
 /**
  * 清除购物车
  * @param object ids join(',') 切割成字符串
  */
 export function cartDel(ids) {
-	if (typeof ids === 'object')
-		ids = ids.join(',');
-	return request.post('cart/delete', {
+	console.log(ids)
+	return request.post('front/cart/delete', {
 		ids: ids
 	}, {}, 1);
 }
@@ -43,7 +45,7 @@ export function cartDel(ids) {
  *
  */
 export function getResetCart(data) {
-	return request.post('cart/resetcart', data);
+	return request.post('front/cart/resetcart', data);
 }
 
 /**
@@ -51,7 +53,7 @@ export function getResetCart(data) {
  * @param object data
  */
 export function getOrderList(data) {
-	return request.get('order/list', data);
+	return request.get('front/order/list', data);
 }
 
 /**
@@ -59,7 +61,7 @@ export function getOrderList(data) {
  * @param string unique
  */
 export function orderProduct(data) {
-	return request.post('order/product', data);
+	return request.post('front/order/product', data);
 }
 
 /**
@@ -68,7 +70,7 @@ export function orderProduct(data) {
  *
  */
 export function orderComment(data) {
-	return request.post('order/comment', data);
+	return request.post('front/order/comment', data);
 }
 
 /**
@@ -76,14 +78,14 @@ export function orderComment(data) {
  * @param object data
  */
 export function orderPay(data) {
-	return request.post('order/pay', data);
+	return request.post('front/order/pay', data);
 }
 
 /**
  * 订单统计数据
  */
 export function orderData() {
-	return request.get('order/data')
+	return request.get('front/order/data')
 }
 
 /**
@@ -92,7 +94,7 @@ export function orderData() {
  *
  */
 export function orderCancel(id) {
-	return request.post('order/cancel', {
+	return request.post('front/order/cancel', {
 		id: id
 	}, {}, 1);
 }
@@ -103,7 +105,7 @@ export function orderCancel(id) {
  *
  */
 export function orderDel(uni) {
-	return request.post('order/del', {
+	return request.post('front/order/del', {
 		id: uni
 	}, {}, 1);
 }
@@ -113,7 +115,7 @@ export function orderDel(uni) {
  * @param string uni
  */
 export function getOrderDetail(uni) {
-	return request.get('order/detail/' + uni);
+	return request.get('front/order/detail/' + uni);
 }
 
 /**
@@ -122,7 +124,7 @@ export function getOrderDetail(uni) {
  *
  */
 export function orderAgain(uni) {
-	return request.post('order/again', {
+	return request.post('front/order/again', {
 		orderNo: uni
 	});
 }
@@ -133,7 +135,7 @@ export function orderAgain(uni) {
  *
  */
 export function orderTake(uni) {
-	return request.post('order/take', {
+	return request.post('front/order/take', {
 		id: uni
 	}, {}, 1);
 }
@@ -143,7 +145,7 @@ export function orderTake(uni) {
  * @returns {*}
  */
 export function express(uni) {
-	return request.get("order/express/" + uni);
+	return request.get("front/order/express/" + uni);
 }
 
 /**
@@ -151,7 +153,7 @@ export function express(uni) {
  *
  */
 export function ordeRefundReason() {
-	return request.get('order/refund/reason');
+	return request.get('front/order/refund/reason');
 }
 
 /**
@@ -159,7 +161,7 @@ export function ordeRefundReason() {
  * @param object data
  */
 export function orderRefundVerify(data) {
-	return request.post('order/refund', data);
+	return request.post('front/order/refund', data);
 }
 
 /**
@@ -167,7 +169,7 @@ export function orderRefundVerify(data) {
  * @param string cartId
  */
 export function orderConfirm(cartId, isNew, addAgain,secKill,combination,bargain) {
-	return request.post('order/confirm', {
+	return request.post('front/order/confirm', {
 		cartIds: cartId,
 		isNew: isNew,
 		addAgain: addAgain,
@@ -183,7 +185,7 @@ export function orderConfirm(cartId, isNew, addAgain,secKill,combination,bargain
  *
  */
 export function getCouponsOrderPrice(preOrderNo) {
-	return request.get(`coupons/order/${preOrderNo}`)
+	return request.get(`front/coupons/order/${preOrderNo}`)
 }
 
 /**
@@ -193,7 +195,7 @@ export function getCouponsOrderPrice(preOrderNo) {
  *
  */
 export function orderCreate(data) {
-	return request.post('order/create', data);
+	return request.post('front/order/create', data);
 }
 
 /**
@@ -203,7 +205,7 @@ export function orderCreate(data) {
  * @returns {*}
  */
 export function postOrderComputed(data) {
-	return request.post("order/computed/price", data);
+	return request.post("front/order/computed/price", data);
 }
 
 /**
@@ -211,7 +213,7 @@ export function postOrderComputed(data) {
  * @param object data
  */
 export function qrcodeApi(data) {
-	return request.post('qrcode/str2base64', data, {}, 1);
+	return request.post('front/qrcode/str2base64', data, {}, 1);
 }
 
 /**
@@ -219,7 +221,7 @@ export function qrcodeApi(data) {
  * @param object data
  */
 export function wechatOrderPay(data) {
-	return request.post('pay/payment', data);
+	return request.post('api/front/pay/payment', data);
 }
 
 /**
@@ -227,7 +229,7 @@ export function wechatOrderPay(data) {
  * @param object data
  */
 export function wechatQueryPayResult(data) {
-	return request.get('pay/queryPayResult?orderNo=' + data);
+	return request.get('front/pay/queryPayResult?orderNo=' + data);
 }
 
 /**
@@ -235,7 +237,7 @@ export function wechatQueryPayResult(data) {
  * @param object data
  */
 export function applyRefund(orderId) {
-	return request.get(`order/apply/refund/${orderId}`);
+	return request.get(`front/order/apply/refund/${orderId}`);
 }
 
 /**
@@ -251,5 +253,5 @@ export function preOrderApi(data) {
  * @param object preOrderNo
  */
 export function loadPreOrderApi(preOrderNo) {
-	return request.get(`order/load/pre/${preOrderNo}`);
+	return request.get(`front/order/load/pre/${preOrderNo}`);
 }
diff --git a/yudao-ui-app/api/product.js b/yudao-ui-app/api/product.js
index 627013c46..281cbce58 100644
--- a/yudao-ui-app/api/product.js
+++ b/yudao-ui-app/api/product.js
@@ -1,8 +1,17 @@
 //请求工具参考https://ext.dcloud.net.cn/plugin?id=392
 const { http } = uni.$u
-
+import request from "@/utils/request.js";
 // 查询商品spu列表
 export const productSpuPage = params => http.get('product/spu/page', { params })
 
 // 查询商品
-export const getSpuDetail = id => http.get('product/spu/get-detail?id=' + id, { })
+export const getSpuDetail = id => request.get('front/product/detail/' + id, { })
+
+// 查询商品列表
+export const productPage = params => request.get('front/products', { params })
+
+// 获取Banner图
+export const getBanner = params => request.post('market/banner/list', { params })
+
+// 获取租户
+export const getTenant = id => request.get('tenant/get/' , {id:id })
diff --git a/yudao-ui-app/common/config.js b/yudao-ui-app/common/config.js
index 66cf4a94e..b3fda4c66 100644
--- a/yudao-ui-app/common/config.js
+++ b/yudao-ui-app/common/config.js
@@ -1,6 +1,7 @@
 module.exports = {
   //后端接口地址
-  baseUrl: 'http://127.0.0.1:48080/app-api',
+  // baseUrl: 'https://cmx.bskies.cc:8000//cyywl-phone-query-api/',
+	baseUrl: 'http://jn6jh2.natappfree.cc/app-api',
   // baseUrl: 'http://api-dashboard.yudao.iocoder.cn/app-api',
   // 超时
   timeout: 30000,
diff --git a/yudao-ui-app/libs/order.js b/yudao-ui-app/libs/order.js
index 3cdf6af20..92ffabde5 100644
--- a/yudao-ui-app/libs/order.js
+++ b/yudao-ui-app/libs/order.js
@@ -35,8 +35,9 @@ export function getPreOrder(preOrderType, orderDetails) {
 			"preOrderType": preOrderType,
 			"orderDetails": orderDetails
 		}).then(res => {
+			// console.log(res.data.columns.preOrderNo,'preOrder')
 			uni.navigateTo({
-				url: '/pages/users/order_confirm/index?preOrderNo=' + res.data.preOrderNo
+				url: '/pages/users/order_confirm/index?preOrderNo=' + res.data.columns.preOrderNo
 			});
 		}).catch(err => {
 			return util.Tips({
diff --git a/yudao-ui-app/package-lock.json b/yudao-ui-app/package-lock.json
index e6a23bf59..6d748ad88 100644
--- a/yudao-ui-app/package-lock.json
+++ b/yudao-ui-app/package-lock.json
@@ -3,332 +3,6 @@
   "version": "1.0.0",
   "lockfileVersion": 2,
   "requires": true,
-  "packages": {
-    "": {
-      "name": "yudao-ui-app",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "clipboard": "^2.0.11",
-        "html-to-image": "^1.11.11",
-        "qrcode": "^1.5.3"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clipboard": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
-      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-      "dependencies": {
-        "good-listener": "^1.2.2",
-        "select": "^1.1.2",
-        "tiny-emitter": "^2.0.0"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/delegate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-    },
-    "node_modules/dijkstrajs": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
-      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/encode-utf8": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/encode-utf8/-/encode-utf8-1.0.3.tgz",
-      "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
-    },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/good-listener": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
-      "dependencies": {
-        "delegate": "^3.1.2"
-      }
-    },
-    "node_modules/html-to-image": {
-      "version": "1.11.11",
-      "resolved": "https://registry.npmmirror.com/html-to-image/-/html-to-image-1.11.11.tgz",
-      "integrity": "sha512-9gux8QhvjRO/erSnDPv28noDZcPZmYE7e1vFsBLKLlRlKDSqNJYebj6Qz1TGd5lsRV+X+xYyjCKjuZdABinWjA=="
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pngjs": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
-      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/qrcode": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.3.tgz",
-      "integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
-      "dependencies": {
-        "dijkstrajs": "^1.0.1",
-        "encode-utf8": "^1.0.3",
-        "pngjs": "^5.0.0",
-        "yargs": "^15.3.1"
-      },
-      "bin": {
-        "qrcode": "bin/qrcode"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
-    "node_modules/select": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
-      "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
-    },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tiny-emitter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
-    },
-    "node_modules/which-module": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
-      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
-    },
-    "node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-    },
-    "node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    }
-  },
   "dependencies": {
     "ansi-regex": {
       "version": "5.0.1",
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index da66973c9..2d84fc156 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -586,13 +586,18 @@
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"list": [
-   //    {
-			// 	"pagePath": "pages/index/index",
-			// 	"iconPath": "static/images/tabbar/nav_icon_shop.png",
-			// 	"selectedIconPath": "static/images/tabbar/nav_icon_shop_active.png",
-			// 	"text": "商城"
-			// },
-
+      {
+				"pagePath": "pages/index/index",
+				"iconPath": "static/images/tabbar/nav_icon_shop.png",
+				"selectedIconPath": "static/images/tabbar/nav_icon_shop_active.png",
+				"text": "商城"
+			},
+      {
+      	"pagePath": "pages/goods_cate/goods_cate",
+      	"iconPath": "static/images/tabbar/nav_icon_sort.png",
+      	"selectedIconPath": "static/images/tabbar/nav_icon_sort_active.png",
+      	"text": "分类"
+      },
       {
       	"pagePath": "pages/member_application/index",
       	"iconPath": "static/images/tabbar/nav_icon_member.png",
@@ -606,18 +611,12 @@
       	"text": "会员申请",
         "visible":false
       },
-      {
-      	"pagePath": "pages/goods_cate/goods_cate",
-      	"iconPath": "static/images/tabbar/nav_icon_sort.png",
-      	"selectedIconPath": "static/images/tabbar/nav_icon_sort_active.png",
-      	"text": "分类"
-      },
-			// {
-			// 	"pagePath": "pages/order_addcart/order_addcart",
-			// 	"iconPath": "static/images/tabbar/nav_icon_cart.png",
-			// 	"selectedIconPath": "static/images/3-002.png",
-			// 	"text": "购物车"
-			// },
+			{
+				"pagePath": "pages/order_addcart/order_addcart",
+				"iconPath": "static/images/tabbar/nav_icon_cart.png",
+				"selectedIconPath": "static/images/3-002.png",
+				"text": "购物车"
+			},
 			{
 				"pagePath": "pages/user/index",
 				"iconPath": "static/images/tabbar/nav_icon_my.png",
diff --git a/yudao-ui-app/pages/cart/cart - 副本.vue b/yudao-ui-app/pages/cart/cart - 副本.vue
new file mode 100644
index 000000000..00a190767
--- /dev/null
+++ b/yudao-ui-app/pages/cart/cart - 副本.vue	
@@ -0,0 +1,225 @@
+<template>
+  <view class="container">
+    <!-- 购物车为空 -->
+    <view v-if="!hasLogin || cartList.length === 0">
+      <view class="cart-empty">
+        <u-empty text="去逛逛添点什么吧" width="500rpx" height="500rpx" icon="/static/images/empty/cart.png"></u-empty>
+      </view>
+    </view>
+
+    <!-- 购物车列表 -->
+    <scroll-view v-if="hasLogin && cartList.length > 0" class="cart-product" scroll-y="true">
+      <yd-cart-product :product-list="cartList" @productCheckedChange="handleProductCheckedChange" @productCountChange="handleProductCountChange"></yd-cart-product>
+    </scroll-view>
+
+    <!-- 未登录 -->
+    <view v-if="!hasLogin" class="login-tips-box">
+      <view class="login-tips">
+        <navigator url="/pages/login/social" open-type="navigate" hover-class="none">
+          <view class="login-link">登录查看</view>
+        </navigator>
+      </view>
+    </view>
+
+    <!-- 底部菜单 -->
+    <view class="cart-btn-container">
+      <view class="btn-box">
+        <view class="product-check-info">
+          <view class="check-all-btn" @click.stop="handleCheckAllProduct">
+            <u-icon v-if="isCheckAll" name="checkmark-circle-fill" color="#3c9cff" size="22"></u-icon>
+            <view v-else class="un-check-box"></view>
+          </view>
+          <view class="info-text">合计：</view>
+          <view>
+            <yd-text-price color="red" size="15" intSize="20" :price="totalAmount"></yd-text-price>
+          </view>
+        </view>
+
+        <view v-if="checkedProduct.length > 0" class="cart-btn-group">
+          <u-button type="warning" shape="circle" size="small" text="移除" @click="handleRemoveProduct"></u-button>
+          <view class="btn-gap"></view>
+          <u-button style="margin-left: 10px" class="main-btn" type="primary" shape="circle" size="small" text="去结算" @click="handleCheckoutProduct"></u-button>
+        </view>
+        <view v-else class="cart-btn-group">
+          <u-button type="warning" shape="circle" size="small" text="移除" disabled></u-button>
+          <view class="btn-gap"></view>
+          <u-button style="margin-left: 10px" class="main-btn" type="primary" shape="circle" size="small" text="去结算" disabled></u-button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      title: '',
+      cartList: [],
+      checkedNumber: 0,
+      totalAmount: 0
+    }
+  },
+  computed: {
+    checkedProduct() {
+      return this.cartList.filter(item => {
+        return item.checked
+      })
+    },
+    isCheckAll() {
+      if (this.cartList.length < 1) {
+        return false
+      }
+      return this.cartList.every(item => {
+        return item.checked
+      })
+    },
+    hasLogin() {
+      return this.$store.getters.hasLogin
+    }
+  },
+  onShow() {
+    if (this.hasLogin) {
+      this.loadCartDetailData()
+    } else {
+      this.cartList =[]
+    }
+  },
+  methods: {
+    loadCartDetailData() {
+      this.$store.dispatch('CartProductDetail').then(res => {
+        this.cartList = res.data || []
+      })
+    },
+    /** 商品全选/取消全选 */
+    handleCheckAllProduct() {
+      if (this.cartList.length < 1) {
+        return
+      }
+      const productIds = this.cartList.map(item => {
+        return item.productId
+      })
+      this.$store.dispatch('CartProductCheckChange', { productIds, checked: !this.isCheckAll }).then(res => {
+        this.cartList = res.data || []
+      })
+    },
+    /** 商品单选/取消单选 */
+    handleProductCheckedChange(productId, checked) {
+      this.$store.dispatch('CartProductCheckChange', { productIds: [productId], checked: checked }).then(res => {
+        this.cartList = res.data || []
+      })
+    },
+    /** 修改购物车商品数量 */
+    handleProductCountChange(productId, number) {
+      this.$store.dispatch('CartProductCountChange', { productIds: [productId], productCount: number }).then(res => {
+        this.cartList = res.data || []
+      })
+    },
+    /** 移除购物车商品 */
+    handleRemoveProduct() {
+      if (this.checkedProduct < 1) {
+        return
+      }
+      const productIds = this.checkedProduct.map(item => {
+        return item.productId
+      })
+
+      uni.showModal({
+        title: '确定要移除选中的商品？',
+        cancelText: '取消',
+        confirmText: '移除',
+        success: res => {
+          if (res.confirm) {
+            this.$store.dispatch('CartProductCountChange', { productIds: productIds, productCount: 0 }).then(res => {
+              this.cartList = res.data || []
+            })
+          } else if (res.cancel) {
+            //console.log('用户点击取消')
+          }
+        }
+      })
+    },
+    /** 购物车提交结算 */
+    handleCheckoutProduct() {
+      if (this.checkedProduct < 1) {
+        return
+      }
+      const checkedProduct = this.checkedProduct.map(item => {
+        return { productId: item.productId, productCount: item.productCount, sellPrice: item.sellPrice }
+      })
+      uni.$u.route('/pages/checkout/checkout', {
+        checkedProduct: JSON.stringify(checkedProduct)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.login-tips-box {
+  padding-top: 100rpx;
+
+  .login-tips {
+    @include flex-center;
+    color: #939393;
+    font-size: 24rpx;
+    letter-spacing: 5rpx;
+  }
+
+  .login-link {
+    width: 160rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    border-radius: 50rpx;
+    border: 1px solid #777;
+    color: #777;
+    text-align: center;
+  }
+}
+
+.cart-btn-container {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+
+  .btn-box {
+    background: $custom-bg-color;
+    border-top: $custom-border-style;
+
+    width: 750rpx;
+    @include flex-space-between();
+    height: 100rpx;
+
+    .product-check-info {
+      @include flex-left;
+
+      .check-all-btn {
+        padding: 20rpx;
+
+        .un-check-box {
+          width: 20px;
+          height: 20px;
+          border: 1px solid #939393;
+          border-radius: 50%;
+        }
+      }
+
+      .info-text {
+        font-size: 26rpx;
+        font-weight: bold;
+        color: #666666;
+      }
+    }
+
+    .cart-btn-group {
+      @include flex-right();
+      width: 360rpx;
+      padding-right: 10px;
+
+      .btn-gap {
+        width: 20rpx;
+      }
+    }
+  }
+}
+</style>
diff --git a/yudao-ui-app/pages/cart/cart.vue b/yudao-ui-app/pages/cart/cart.vue
index 00a190767..92858763f 100644
--- a/yudao-ui-app/pages/cart/cart.vue
+++ b/yudao-ui-app/pages/cart/cart.vue
@@ -1,52 +1,9 @@
 <template>
   <view class="container">
-    <!-- 购物车为空 -->
-    <view v-if="!hasLogin || cartList.length === 0">
-      <view class="cart-empty">
-        <u-empty text="去逛逛添点什么吧" width="500rpx" height="500rpx" icon="/static/images/empty/cart.png"></u-empty>
-      </view>
-    </view>
-
-    <!-- 购物车列表 -->
-    <scroll-view v-if="hasLogin && cartList.length > 0" class="cart-product" scroll-y="true">
-      <yd-cart-product :product-list="cartList" @productCheckedChange="handleProductCheckedChange" @productCountChange="handleProductCountChange"></yd-cart-product>
-    </scroll-view>
-
-    <!-- 未登录 -->
-    <view v-if="!hasLogin" class="login-tips-box">
-      <view class="login-tips">
-        <navigator url="/pages/login/social" open-type="navigate" hover-class="none">
-          <view class="login-link">登录查看</view>
-        </navigator>
-      </view>
-    </view>
-
-    <!-- 底部菜单 -->
-    <view class="cart-btn-container">
-      <view class="btn-box">
-        <view class="product-check-info">
-          <view class="check-all-btn" @click.stop="handleCheckAllProduct">
-            <u-icon v-if="isCheckAll" name="checkmark-circle-fill" color="#3c9cff" size="22"></u-icon>
-            <view v-else class="un-check-box"></view>
-          </view>
-          <view class="info-text">合计：</view>
-          <view>
-            <yd-text-price color="red" size="15" intSize="20" :price="totalAmount"></yd-text-price>
-          </view>
-        </view>
-
-        <view v-if="checkedProduct.length > 0" class="cart-btn-group">
-          <u-button type="warning" shape="circle" size="small" text="移除" @click="handleRemoveProduct"></u-button>
-          <view class="btn-gap"></view>
-          <u-button style="margin-left: 10px" class="main-btn" type="primary" shape="circle" size="small" text="去结算" @click="handleCheckoutProduct"></u-button>
-        </view>
-        <view v-else class="cart-btn-group">
-          <u-button type="warning" shape="circle" size="small" text="移除" disabled></u-button>
-          <view class="btn-gap"></view>
-          <u-button style="margin-left: 10px" class="main-btn" type="primary" shape="circle" size="small" text="去结算" disabled></u-button>
-        </view>
-      </view>
-    </view>
+		<view class="navbar">
+			<u-navbar title="个人中心">
+			</u-navbar>
+		</view>
   </view>
 </template>
 
@@ -156,70 +113,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.login-tips-box {
-  padding-top: 100rpx;
 
-  .login-tips {
-    @include flex-center;
-    color: #939393;
-    font-size: 24rpx;
-    letter-spacing: 5rpx;
-  }
-
-  .login-link {
-    width: 160rpx;
-    height: 50rpx;
-    line-height: 50rpx;
-    border-radius: 50rpx;
-    border: 1px solid #777;
-    color: #777;
-    text-align: center;
-  }
-}
-
-.cart-btn-container {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-
-  .btn-box {
-    background: $custom-bg-color;
-    border-top: $custom-border-style;
-
-    width: 750rpx;
-    @include flex-space-between();
-    height: 100rpx;
-
-    .product-check-info {
-      @include flex-left;
-
-      .check-all-btn {
-        padding: 20rpx;
-
-        .un-check-box {
-          width: 20px;
-          height: 20px;
-          border: 1px solid #939393;
-          border-radius: 50%;
-        }
-      }
-
-      .info-text {
-        font-size: 26rpx;
-        font-weight: bold;
-        color: #666666;
-      }
-    }
-
-    .cart-btn-group {
-      @include flex-right();
-      width: 360rpx;
-      padding-right: 10px;
-
-      .btn-gap {
-        width: 20rpx;
-      }
-    }
-  }
-}
 </style>
diff --git a/yudao-ui-app/pages/index/index - 副本.vue b/yudao-ui-app/pages/index/index - 副本.vue
new file mode 100644
index 000000000..c04cadebf
--- /dev/null
+++ b/yudao-ui-app/pages/index/index - 副本.vue	
@@ -0,0 +1,1378 @@
+<template>
+	<view>
+		<view class="page-index" :class="{'bgf':navIndex >0}">
+			<!-- #ifdef H5 -->
+			<view class="header">
+				<view class="serch-wrapper flex">
+					<view class="logo">
+						<image :src="logoUrl" mode=""></image>
+					</view>
+					<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text
+							class="iconfont icon-xiazai5"></text>
+						搜索商品</navigator>
+				</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef MP -->
+			<view class="mp-header">
+				<view class="sys-head" :style="{ height: statusBarHeight }"></view>
+				<view class="serch-box" style="height: 40px;">
+					<view class="serch-wrapper flex">
+						<view class="logo">
+							<image :src="logoUrl" mode=""></image>
+						</view>
+						<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text
+								class="iconfont icon-xiazai5"></text>
+							搜索商品</navigator>
+					</view>
+				</view>
+			</view>
+			<!-- #endif -->
+			<!-- 首页展示 -->
+			<view class="page_content" :style="'margin-top:'+(marTop)+'px;'">
+				<!-- <view class="page_content" :style="'margin-top:'+(marTop)+'px;'" v-if="navIndex == 0"> -->
+				<view class="mp-bg"></view>
+				<!-- banner -->
+				<!-- <view class="swiper" v-if="imgUrls.length"> -->
+					<view class="swiper">
+					<swiper indicator-dots="true" :autoplay="true" :circular="circular" :interval="interval"
+						:duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+						<block v-for="(item,index) in imgUrls" :key="index">
+							<swiper-item>
+								<navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper'
+									hover-class='none'>
+									<image :src="item.pic" class="slide-image" lazy-load></image>
+								</navigator>
+							</swiper-item>
+						</block>
+					</swiper>
+				</view>
+				<!-- 新闻简报 -->
+				<view class='notice acea-row row-middle row-between'>
+					<!-- <view class='notice acea-row row-middle row-between' v-if="roll.length"> -->
+					<view class="pic">
+						<image src="/static/images/xinjian.png"></image>
+					</view>
+					<text class='line'>|</text>
+					<view class='swipers'>
+						<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500" duration="500" vertical="true"
+						 circular="true">
+							<block v-for="(item,index) in roll" :key='index'>
+								<swiper-item>
+									<navigator class='item' :url='item.url' hover-class='none'>
+										<view class='line1'>{{item.info}}</view>
+									</navigator>
+								</swiper-item>
+							</block>
+						</swiper>
+					</view>
+					<view class="iconfont icon-xiangyou"></view>
+				</view>
+				<!-- menu -->
+				<view class='nav acea-row'>
+					<!-- <view class='nav acea-row' v-if="menus.length"> -->
+					<block v-for="(item,index) in menus" :key="index">
+						<navigator class='item' v-if="item.show == '1'" :url='item.url' open-type='switchTab'
+							hover-class='none'>
+							<view class='pictrue'>
+								<image :src='item.pic'></image>
+							</view>
+							<view class="menu-txt">{{item.name}}</view>
+						</navigator>
+						<navigator class='item' v-else :url='item.url' hover-class='none'>
+							<view class='pictrue'>
+								<image :src='item.pic'></image>
+							</view>
+							<view class="menu-txt">{{item.name}}</view>
+						</navigator>
+					</block>
+				</view>
+				<!-- 优惠券 -->
+				<view class="couponIndex">
+				<!-- <view class="couponIndex" v-if="couponList.length>0"> -->
+					<view class="acea-row" style="height: 100%;">
+						<view class="titBox">
+							<view class="tit1">领取优惠券</view>
+							<view class="tit2">福利大礼包，省了又省</view>
+							<navigator class='item' url='/pages/users/user_get_coupon/index' hover-class='none'>
+								<view class="tit3">查看全部 <text class="iconfont icon-xiangyou"></text></view>
+							</navigator>
+						</view>
+						<view class="listBox acea-row">
+							<view class="list" :class='item.isUse ? "listHui" : "listActive" ' v-for="(item, index) in couponList.slice(0,2)" :key="index">
+								<view class="tit line1" :class='item.isUse ? "pricehui" : "titActive" '>{{item.name}}</view>
+								<view class="price" :class='item.isUse ? "pricehui" : "icon-color" '>{{item.money?Number(item.money):''}}<text class="yuan">元</text></view>
+								<view class="ling" v-if="!item.isUse" :class='item.isUse ? "pricehui" : "icon-color" '  @click="getCoupon(item.id,index)">领取</view>
+								<view class="ling" v-else :class='item.isUse ? "pricehui fonthui" : "icon-color" '>已领取</view>
+								<view class="priceM">满{{item.minPrice?Number(item.minPrice):''}}元可用</view>
+							</view>
+						</view>
+
+					</view>
+				</view>
+				<!-- 活动-->
+				<a_seckill></a_seckill>
+				<b_combination></b_combination>
+				<c_bargain></c_bargain>
+
+				<!-- 首页推荐 -->
+				<!-- :class="iSshowH?'on':''" -->
+				<view class="sticky-box" :style="'top:'+(marTop)+'px;'">
+					<scroll-view class="scroll-view_H" style="width: 100%;" scroll-x="true" scroll-with-animation
+						:scroll-left="tabsScrollLeft" @scroll="scroll">
+						<view class="tab nav-bd" id="tab_list">
+							<view id="tab_item" :class="{ 'active': listActive == index}" class="item"
+								v-for="(item, index) in explosiveMoney" :key="index" @click="ProductNavTab(item,index)">
+								<view class="txt">{{item.name}}</view>
+								<view class="label">{{item.info}}</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+
+				<!-- 首发新品 -->
+				<view class="index-product-wrapper" :class="iSshowH?'on':''">
+					<view class="list-box animated" :class='tempArr.length > 0?"fadeIn on":""'>
+						<view class="item" v-for="(item,index) in tempArr" :key="index" @click="goDetail(item)">
+							<view class="pictrue">
+								<span class="pictrue_log pictrue_log_class"
+									v-if="item.activityH5 && item.activityH5.type === '1'">秒杀</span>
+								<span class="pictrue_log pictrue_log_class"
+									v-if="item.activityH5 && item.activityH5.type === '2'">砍价</span>
+								<span class="pictrue_log pictrue_log_class"
+									v-if="item.activityH5 && item.activityH5.type === '3'">拼团</span>
+								<image :src="item.image" mode=""></image>
+							</view>
+							<view class="text-info">
+								<view class="title line1">{{item.storeName}}</view>
+								<view class="old-price"><text>¥{{item.otPrice}}</text></view>
+								<view class="price">
+									<text>￥</text>{{item.price}}
+									<view class="txt" v-if="item.checkCoupon">券</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class='loadingicon acea-row row-center-wrapper' v-if="goodScroll">
+						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
+					</view>
+					<view class="mores-txt flex" v-if="!goodScroll">
+						<text>我是有底线的</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import Auth from '@/libs/wechat';
+	import Cache from '../../utils/cache';
+	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+	let app = getApp();
+	import {
+		getIndexData,
+		getCoupons,
+		setCouponReceive
+	} from '@/api/api.js';
+	// #ifdef MP-WEIXIN
+	import {
+		getTemlIds
+	} from '@/api/api.js';
+	// import {
+	// 	SUBSCRIBE_MESSAGE,
+	// 	TIPS_KEY
+	// } from '@/config/cache';
+	// #endif
+	// #ifdef H5  
+	import {
+		follow
+	} from '@/api/public.js';
+	// #endif
+	import {
+		getShare
+	} from '@/api/public.js';
+	import a_seckill from './components/a_seckill';
+	import b_combination from './components/b_combination';
+	import c_bargain from './components/c_bargain';
+	import goodList from '@/components/goodList';
+	import promotionGood from '@/components/promotionGood';
+	import couponWindow from '@/components/couponWindow';
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		mapGetters
+	} from "vuex";
+	import tabNav from '@/components/tabNav.vue'
+	import countDown from '@/components/countDown';
+	import {
+		getCategoryList,
+		getProductslist,
+		getProductHot,
+		getGroomList
+	} from '@/api/store.js';
+	// import {
+	// 	setVisit
+	// } from '@/api/user.js'
+	import recommend from '@/components/recommend';
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	import {
+		silenceBindingSpread
+	} from '@/utils';
+	// #ifndef MP
+	import {
+		kefuConfig
+	} from "@/api/public";
+	import {
+		getWechatConfig
+	} from "@/api/public";
+	// #endif
+	import Loading from '@/components/Loading/index.vue';
+	const arrTemp = ["beforePay", "afterPay", "refundApply", "beforeRecharge", "createBargain", "pink"];
+	export default {
+		computed: mapGetters(['isLogin', 'uid']),
+		components: {
+			tabNav,
+			goodList,
+			promotionGood,
+			couponWindow,
+			countDown,
+			a_seckill,
+			b_combination,
+			c_bargain,
+			recommend,
+			// #ifdef MP
+			authorize,
+			// #endif
+			Loading
+		},
+		data() {
+			return {
+				loaded: false,
+				loading: false,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				statusBarHeight: statusBarHeight,
+				navIndex: 0,
+				navTop: [],
+				followUrl: "",
+				followHid: true,
+				followCode: false,
+				logoUrl: "",
+				imgUrls: [],
+				itemNew: [],
+				menus: [],
+				bastInfo: '',
+				fastInfo: '',
+				fastList: [],
+				firstInfo: '',
+				salesInfo: '',
+				indicatorDots: false,
+				circular: true,
+				autoplay: true,
+				interval: 3000,
+				duration: 500,
+				window: false,
+				iShidden: false,
+				navH: "",
+				newGoodsBananr: '',
+				couponList: [],
+				liveList: [],
+				hotList: [{
+					pic: '/static/images/hot_001.png'
+				}, {
+					pic: '/static/images/hot_002.png'
+				}, {
+					pic: '/static/images/hot_003.png'
+				}],
+				ProductNavindex: 0,
+				marTop: 0,
+				childID: 0,
+				loadend: false,
+				loadTitle: '加载更多',
+				sortProduct: [],
+				where: {
+					cid: 0,
+					page: 1,
+					limit: 10,
+				},
+				is_switch: true,
+				hotPage: 1,
+				hotLimit: 10,
+				hotScroll: false,
+				explosiveMoney: [],
+				prodeuctTop: 0,
+				searchH: 0,
+				isFixed: false,
+				goodType: 0, //精品推荐Type
+				goodScroll: true, //精品推荐开关
+				params: { //精品推荐分页
+					page: 1,
+					limit: 10,
+				},
+				tempArr: [], //精品推荐临时数组
+				roll: [], // 新闻简报
+				site_name: '', //首页title
+				iSshowH: false,
+				configApi: {}, //分享类容配置
+				spikeList: [], // 秒杀
+				point: '',
+				privacyStatus: false, // 隐私政策是否同意过
+				tabsScrollLeft: 0, // tabs当前偏移量
+				scrollLeft: 0,
+				lineColor: 'red',
+				lineStyle: {}, // 下划线位置--动态甲酸
+				listActive: 0, // 当前选中项
+
+				duration: 0.2 // 下划线动画时长
+			}
+		},
+		watch: {
+			ProductNavindex(newVal) { // 监听当前选中项
+				this.setTabList()
+			},
+			listActive(newVal) { // 监听当前选中项
+				this.setTabList()
+			}
+		},
+		mounted() {
+			this.setTabList()
+		},
+		onLoad() {
+			var that = this;
+			// 获取系统信息
+			uni.getSystemInfo({
+				success(res) {
+					that.$store.commit("SYSTEM_PLATFORM", res.platform);
+				}
+			});
+			uni.getLocation({
+				type: 'gcj02',
+				altitude: true,
+				geocode: true,
+				success: function(res) {
+					try {
+						uni.setStorageSync('user_latitude', res.latitude);
+						uni.setStorageSync('user_longitude', res.longitude);
+					} catch {}
+				}
+			});
+			let self = this
+			// #ifdef MP
+			// 获取小程序头部高度
+			this.navH = app.globalData.navHeight;
+			let info = uni.createSelectorQuery().select(".mp-header");
+			info.boundingClientRect(function(data) {
+				self.marTop = data.height
+				self.poTop = Number(data.height) + 84
+			}).exec()
+			// #endif
+			// #ifndef MP
+			this.navH = 0;
+			// #endif
+			this.isLogin && silenceBindingSpread();
+			// Promise.all([this.getAllCategory(), this.getIndexConfig()
+			// 	// , this.setVisit()
+			// ]);
+			this.getIndexConfig();
+			// #ifdef MP
+			this.getTemlIds()
+			// #endif
+		},
+		onShow() {
+			let self = this
+			uni.setNavigationBarTitle({
+				title: self.site_name
+			})
+		},
+		methods: {
+			getCoupon: function(id, index) {
+				let that = this;
+				//领取优惠券
+				setCouponReceive(id).then(function(res) {
+					that.$set(that.couponList[index], 'isUse', true);
+					that.$util.Tips({
+						title: '领取成功'
+					});
+				}, function(res) {
+					return that.$util.Tips({
+						title: res
+					});
+				})
+			},
+			clickSort(index) {
+				this.listActive = index
+			},
+			// scroll-view滑动事件
+			scroll(e) {
+				this.scrollLeft = e.detail.scrollLeft;
+			},
+			setTabList() {
+				this.$nextTick(() => {
+					//this.setLine()
+					this.scrollIntoView()
+				})
+			},
+			// 计算tabs位置
+			scrollIntoView() { // item滚动
+				let lineLeft = 0;
+				this.getElementData('#tab_list', (data) => {
+					let list = data[0]
+					this.getElementData(`#tab_item`, (data) => {
+						let el = data[this.listActive]
+						lineLeft = el.width / 2 + (-list.left) + el.left - list.width / 2 - this.scrollLeft
+						this.tabsScrollLeft = this.scrollLeft + lineLeft
+					})
+				})
+			},
+			//  计算下划线位置
+			setLine() {
+				let lineWidth = 0,
+					lineLeft = 0
+				this.getElementData(`#tab_item`, (data) => {
+					let el = data[this.listActive]
+					lineWidth = el.width / 2
+					// lineLeft = el.width * (this.currentIndex + 0.5)  // 此种只能针对每个item长度一致的
+					lineLeft = el.width / 2 + (-data[0].left) + el.left
+					this.lineStyle = {
+						width: `${lineWidth}px`,
+						transform: `translateX(${lineLeft}px) translateX(-50%)`,
+						transitionDuration: `${this.duration}s`
+					};
+				})
+			},
+			getElementData(el, callback) {
+				uni.createSelectorQuery().in(this).selectAll(el).boundingClientRect().exec((data) => {
+					callback(data[0]);
+				});
+			},
+			xieyiApp() {
+				uni.navigateTo({
+					url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
+				})
+			},
+			// #ifdef MP
+			getTemlIds() {
+				for (var i in arrTemp) {
+					this.getTem(arrTemp[i]);
+				}
+			},
+			getTem(data) {
+				getTemlIds({
+					type: data
+				}).then(res => {
+					if (res.data) {
+						let arr = res.data.map((item) => {
+							return item.tempId
+						})
+						wx.setStorageSync('tempID' + data, arr);
+					}
+				})
+			},
+			// #endif
+			// 首页数据
+			getIndexConfig: function() {
+				let that = this;
+				getIndexData().then(res => {
+					uni.setNavigationBarTitle({
+						title: '首页'
+					})
+					that.$set(that, "logoUrl", res.data.logoUrl);
+					that.$set(that, "site_name", '首页');
+					that.$set(that, "imgUrls", res.data.banner);
+					that.$set(that, "menus", res.data.menus);
+					that.$set(that, "roll", res.data.roll ? res.data.roll : []);
+					// #ifdef H5
+					that.$store.commit("SET_CHATURL", res.data.yzfUrl);
+					Cache.set('chatUrl', res.data.yzfUrl);
+					// #endif
+					that.$set(that, "explosiveMoney", res.data.explosiveMoney);
+					that.goodType = res.data.explosiveMoney[0].type
+					this.getGroomList();
+					this.shareApi();
+					this.getcouponList();
+					// #ifdef H5
+					// that.subscribe = res.data.subscribe;
+					// #endif
+
+				})
+			},
+			getcouponList() {
+				let that = this;
+				getCoupons({
+					page: 1,
+					limit: 6
+				}).then(res => {
+					that.$set(that, "couponList", res.data);
+					// 小程序判断用户是否授权；
+					// #ifdef MP
+					uni.getSetting({
+						success(res) {
+							if (!res.authSetting['scope.userInfo']) {
+								that.window = that.couponList.length ? true : false;
+							} else {
+								that.window = false;
+								that.iShidden = true;
+							}
+						}
+					});
+					// #endif
+					// #ifndef MP
+					if (that.isLogin) {
+						that.window = false;
+					} else {
+						that.window = res.data.length ? true : false;
+					}
+					// #endif
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				});
+			},
+			shareApi: function() {
+				getShare().then(res => {
+					this.$set(this, 'configApi', res.data);
+					// #ifdef H5
+					this.setOpenShare(res.data);
+					// #endif
+				})
+			},
+			getChatUrL() {
+				kefuConfig().then(res => {
+					let data = res.data;
+					this.$store.commit("SET_CHATURL", data.yzfUrl);
+					Cache.set('chatUrl', data.yzfUrl);
+				})
+			},
+			// 微信分享；
+			setOpenShare: function(data) {
+				let that = this;
+				if (that.$wechat.isWeixin()) {
+					let configAppMessage = {
+						desc: data.synopsis,
+						title: data.title,
+						link: location.href,
+						imgUrl: data.img
+					};
+					that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
+						configAppMessage);
+				}
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			// 授权回调
+			onLoadFun() {
+
+			},
+			// 首发新品切换
+			ProductNavTab(item, index) {
+				this.listActive = index
+				this.goodType = item.type
+				this.listActive = index
+				this.ProductNavindex = index
+				this.tempArr = []
+				this.params.page = 1
+				this.goodScroll = true
+				let onloadH = true
+				this.getGroomList(onloadH)
+			},
+			// 首发新品详情
+			goDetail(item) {
+				if (item.activityH5 && item.activityH5.type === "2" && !this.isLogin) {
+					toLogin();
+				} else {
+					goShopDetail(item, this.uid).then(res => {
+						uni.navigateTo({
+							url: `/pages/goods_details/index?id=${item.id}`
+						})
+					})
+				}
+			},
+			// 分类详情
+			godDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${item.id}`
+					})
+				})
+			},
+			// 精品推荐
+			getGroomList(onloadH) {
+				this.loading = true
+				let type = this.goodType;
+				if (!this.goodScroll) return
+				if (onloadH) {
+					this.iSshowH = true
+				}
+				getGroomList(type, this.params).then(({
+					data
+				}) => {
+					this.iSshowH = false
+					this.loading = false
+					this.goodScroll = data.list.length >= this.params.limit
+					this.params.page++
+					this.tempArr = this.tempArr.concat(data.list)
+				})
+			},
+			/**
+			 * 获取我的推荐
+			 */
+			get_host_product: function() {
+				let that = this;
+				that.loading = true;
+			
+				if (that.hotScroll) return
+				getProductHot(
+					that.hotPage,
+					that.hotLimit,
+				).then(res => {
+					that.hotPage++
+					that.hotScroll = res.data.list.length < that.hotLimit
+					that.hostProduct = that.hostProduct.concat(res.data.list)
+				});
+			},
+		},
+		mounted() {
+			let self = this
+			// #ifdef H5
+			//self.getChatUrL();
+			// 获取H5 搜索框高度
+			let appSearchH = uni.createSelectorQuery().select(".serch-wrapper");
+			appSearchH.boundingClientRect(function(data) {
+				self.searchH = data.height
+			}).exec()
+			// #endif
+		},
+		/**
+		 * 用户点击右上角分享
+		 */
+		// #ifdef MP
+		onShareAppMessage: function() {
+			return {
+				title: this.configApi.title,
+				imageUrl: this.configApi.img,
+				desc: this.configApi.synopsis,
+				path: '/pages/index/index'
+			};
+		},
+		// #endif
+		onReachBottom() {
+			if (this.navIndex == 0) {
+				// 首页加载更多
+				if (this.params.page != 1) {
+					this.getGroomList();
+				}
+			} else {
+				// 分类栏目加载更多
+				if (this.sortProduct.length > 0) {
+					//this.get_product_list();
+				} else {
+					this.get_host_product();
+				}
+			}
+		},
+	}
+</script>
+<style>
+	page {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		/* #ifdef H5 */
+		background-color: #fff;
+		/* #endif */
+
+	}
+</style>
+<style lang="scss">
+	.notice{
+		width: 100%;
+		height: 70rpx;
+		border-radius: 10rpx;
+		background-color: #fff;
+		margin-bottom: 25rpx;
+		line-height: 70rpx;
+		padding: 0 14rpx;
+		.line {
+			color: #CCCCCC;
+		}
+		.pic{
+			width: 130rpx;
+			height: 36rpx;
+			image{
+				width: 100%;
+				height: 100%;
+				display: block !important;
+			}
+		}
+		.swipers {
+			height: 100%;
+			width: 444rpx;
+			overflow: hidden;
+			swiper {
+				height: 100%;
+				width: 100%;
+				overflow: hidden;
+				font-size: 22rpx;
+				color: #333333;
+			}
+		}
+		.iconfont {
+			color: #999999;
+			font-size: 20rpx;
+		} 
+	}
+	.couponIndex {
+		width: auto;
+		height: 238rpx;
+		background-image: url('~@/static/images/yhjsy.png');
+		background-size: 100% 100%;
+		padding-left: 42rpx;
+		margin-bottom: 30rpx;
+		
+		.titBox {
+			padding: 47rpx 0;
+			text-align: center;
+			height: 100%;
+
+			.tit1 {
+				color: #FFEBD2;
+				font-size: 34rpx;
+				font-weight: 600;
+			}
+
+			.tit2 {
+				color: #FFEBD2;
+				font-size: 22rpx;
+				margin:10rpx 0 26rpx 0;
+			}
+
+			.tit3 {
+				color: #FFDAAF;
+				font-size: 24rpx;
+				.iconfont {
+					font-size: 20rpx;
+				}
+			}
+		}
+
+		.listBox {
+			padding: 14rpx 0;
+
+			.listActive {
+				background-image: url('~@/static/images/lingyhj.png');
+				background-size: 100% 100%;
+			}
+
+			.listHui {
+				background-image: url('~@/static/images/weiling.png');
+				background-size: 100% 100%;
+			}
+
+			.list {
+				width: 170rpx;
+				height: 210rpx;
+				padding: 16rpx 0;
+				text-align: center;
+				margin-left: 24rpx;
+
+				.tit {
+					font-size: 18rpx;
+					padding: 0 26rpx;
+				}
+
+				.titActive {
+					color: #C99959;
+				}
+
+				.price {
+					font-size: 46rpx;
+					font-weight: 900;
+					margin-top: 4rpx;
+				}
+
+				.pricehui {
+					color: #B2B2B2;
+				}
+                .fonthui{
+					background-color: #F5F5F5 !important;
+				}
+				.yuan {
+					font-size: 24rpx;
+				}
+
+				.ling {
+					font-size: 24rpx;
+					margin-top: 9.5rpx;
+					width: 102rpx;
+					height: 36rpx;
+					line-height: 36rpx;
+					background-color: #FFE5C7;
+					border-radius: 28rpx;
+					margin: auto;
+				}
+
+				.priceM {
+					color: #FFDAAF;
+					font-size: 22rpx;
+					margin-top: 14rpx;
+				}
+			}
+		}
+	}
+
+	.sticky-box {
+		/* #ifndef APP-PLUS-NVUE */
+		display: flex;
+		position: -webkit-sticky;
+		/* #endif */
+		position: sticky;
+		/* #ifdef H5*/
+		top: var(--window-top);
+		/* #endif */
+		
+		z-index: 99;
+		flex-direction: row;
+		margin: 0px;
+		background: #f5f5f5;
+		padding: 30rpx 0;
+	}
+
+	.listAll {
+		width: 20%;
+		text-indent: 62rpx;
+		font-size: 30rpx;
+		border-left: 1px #eee solid;
+		margin: 1% 0;
+		padding: 5rpx;
+		position: relative;
+
+		image {
+			position: absolute;
+			left: 20rpx;
+			top: 8rpx;
+		}
+	}
+
+	.tab {
+		position: relative;
+		display: flex;
+		font-size: 28rpx;
+		white-space: nowrap;
+
+		&__item {
+			flex: 1;
+			padding: 0 20rpx;
+			text-align: center;
+			height: 60rpx;
+			line-height: 60rpx;
+			color: #666;
+
+			&.active {
+				color: #09C2C9;
+			}
+		}
+	}
+
+	.tab__line {
+		display: block;
+		height: 6rpx;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		z-index: 1;
+		border-radius: 3rpx;
+		position: relative;
+		background: #2FC6CD;
+	}
+
+	.scroll-view_H {
+		/* 文本不会换行，文本会在在同一行上继续，直到遇到 <br> 标签为止。 */
+		white-space: nowrap;
+		width: 100%;
+	}
+
+
+	.privacy-wrapper {
+		z-index: 999;
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: #7F7F7F;
+
+		.privacy-box {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+			width: 560rpx;
+			padding: 50rpx 45rpx 0;
+			background: #fff;
+			border-radius: 20rpx;
+
+			.title {
+				text-align: center;
+				font-size: 32rpx;
+				text-align: center;
+				color: #333;
+				font-weight: 700;
+			}
+
+			.content {
+				margin-top: 20rpx;
+				line-height: 1.5;
+				font-size: 26rpx;
+				color: #666;
+				text-indent: 54rpx;
+
+				i {
+					font-style: normal;
+					color: $theme-color;
+				}
+			}
+
+			.btn-box {
+				margin-top: 40rpx;
+				text-align: center;
+				font-size: 30rpx;
+
+				.btn-item {
+					height: 82rpx;
+					line-height: 82rpx;
+					background: linear-gradient(90deg, #F67A38 0%, #F11B09 100%);
+					color: #fff;
+					border-radius: 41rpx;
+				}
+
+				.btn {
+					padding: 30rpx 0;
+				}
+			}
+		}
+	}
+
+	.page-index {
+		display: flex;
+		flex-direction: column;
+		min-height: 100%;
+		background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
+
+		.header {
+			width: 100%;
+			background-color: $theme-color;
+			padding: 28rpx 30rpx;
+
+			.serch-wrapper {
+				align-items: center;
+
+
+				.logo {
+					width: 118rpx;
+					height: 42rpx;
+					margin-right: 24rpx;
+				}
+
+				image {
+					width: 118rpx;
+					height: 42rpx;
+				}
+
+				.input {
+					display: flex;
+					align-items: center;
+					width: 546rpx;
+					height: 58rpx;
+					padding: 0 0 0 30rpx;
+					background: rgba(247, 247, 247, 1);
+					border: 1px solid rgba(241, 241, 241, 1);
+					border-radius: 29rpx;
+					color: #BBBBBB;
+					font-size: 26rpx;
+
+					.iconfont {
+						margin-right: 20rpx;
+						font-size: 26rpx;
+						color: #666666;
+					}
+				}
+			}
+
+			.tabNav {
+				padding-top: 24rpx;
+			}
+		}
+
+		/* #ifdef MP */
+		.mp-header {
+			z-index: 999;
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			/* #ifdef H5 */
+			padding-bottom: 20rpx;
+			/* #endif */
+			background-color: $theme-color;
+
+			.serch-wrapper {
+				height: 100%;
+				align-items: center;
+				padding: 0 50rpx 0 53rpx;
+
+				image {
+					width: 118rpx;
+					height: 42rpx;
+					margin-right: 30rpx;
+				}
+
+				.input {
+					display: flex;
+					align-items: center;
+					/* #ifdef MP */
+					width: 305rpx;
+					/* #endif */
+					height: 50rpx;
+					padding: 0 0 0 30rpx;
+					background: rgba(247, 247, 247, 1);
+					border: 1px solid rgba(241, 241, 241, 1);
+					border-radius: 29rpx;
+					color: #BBBBBB;
+					font-size: 28rpx;
+
+					.iconfont {
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
+
+		/* #endif */
+
+		.page_content {
+			background-color: #f5f5f5;
+			/* #ifdef H5 */
+			// margin-top: 20rpx !important;
+			/* #endif */
+			padding: 0 30rpx;
+
+			.swiper {
+				position: relative;
+				width: 100%;
+				height: 280rpx;
+				margin: 0 auto;
+				border-radius: 10rpx;
+				overflow: hidden;
+				margin-bottom: 25rpx;
+				/* #ifdef MP */
+				z-index: 10;
+				margin-top: 20rpx;
+
+				/* #endif */
+				swiper,
+				.swiper-item,
+				image {
+					width: 100%;
+					height: 280rpx;
+					border-radius: 10rpx;
+				}
+			}
+
+			.nav {
+				padding-bottom: 26rpx;
+				background: #fff;
+				opacity: 1;
+				border-radius: 14rpx;
+				width: 100%;
+				margin-bottom: 30rpx;
+
+				.item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					width: 20%;
+					margin-top: 30rpx;
+
+					image {
+						width: 82rpx;
+						height: 82rpx;
+					}
+				}
+			}
+
+
+			.nav-bd {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+
+					.txt {
+						font-size: 32rpx;
+						color: #282828;
+					}
+
+					.label {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 124rpx;
+						height: 32rpx;
+						margin-top: 5rpx;
+						font-size: 24rpx;
+						color: #999;
+					}
+
+					&.active {
+						color: $theme-color;
+
+						.txt {
+							color: $theme-color;
+						}
+
+						.label {
+							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
+							border-radius: 16rpx;
+							color: #fff;
+						}
+					}
+				}
+			}
+
+			.index-product-wrapper {
+				margin-bottom: 110rpx;
+
+				&.on {
+					min-height: 1500rpx;
+				}
+
+				.list-box {
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: space-between;
+
+					.item {
+						width: 335rpx;
+						margin-bottom: 20rpx;
+						background-color: #fff;
+						border-radius: 10rpx;
+						overflow: hidden;
+
+						image {
+							width: 100%;
+							height: 330rpx;
+						}
+
+						.text-info {
+							padding: 10rpx 20rpx 15rpx;
+
+							.title {
+								color: #222222;
+							}
+
+							.old-price {
+								margin-top: 8rpx;
+								font-size: 26rpx;
+								color: #AAAAAA;
+								text-decoration: line-through;
+
+								text {
+									margin-right: 2px;
+									font-size: 20rpx;
+								}
+							}
+
+							.price {
+								display: flex;
+								align-items: flex-end;
+								color: $theme-color;
+								font-size: 34rpx;
+								font-weight: 800;
+
+								text {
+									padding-bottom: 4rpx;
+									font-size: 24rpx;
+									font-weight: 800;
+								}
+
+								.txt {
+									display: flex;
+									align-items: center;
+									justify-content: center;
+									width: 28rpx;
+									height: 28rpx;
+									margin-left: 15rpx;
+									margin-bottom: 10rpx;
+									border: 1px solid $theme-color;
+									border-radius: 4rpx;
+									font-size: 22rpx;
+									font-weight: normal;
+								}
+							}
+						}
+					}
+
+					&.on {
+						display: flex;
+					}
+				}
+			}
+		}
+	}
+
+	.productList {
+		/* #ifdef H5 */
+		padding-bottom: 140rpx;
+		/* #endif */
+	}
+
+	.productList .list {
+		padding: 0 20rpx;
+	}
+
+	.productList .list.on {
+		background-color: #fff;
+		border-top: 1px solid #f6f6f6;
+	}
+
+	.productList .list .item {
+		width: 345rpx;
+		margin-top: 20rpx;
+		background-color: #fff;
+		border-radius: 10rpx;
+	}
+
+	.productList .list .item.on {
+		width: 100%;
+		display: flex;
+		border-bottom: 1rpx solid #f6f6f6;
+		padding: 30rpx 0;
+		margin: 0;
+	}
+
+	.productList .list .item .pictrue {
+		position: relative;
+		width: 100%;
+		height: 345rpx;
+	}
+
+	.productList .list .item .pictrue.on {
+		width: 180rpx;
+		height: 180rpx;
+	}
+
+	.productList .list .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+
+	.productList .list .item .pictrue image.on {
+		border-radius: 6rpx;
+	}
+
+	.productList .list .item .text {
+		padding: 20rpx 17rpx 26rpx 17rpx;
+		font-size: 30rpx;
+		color: #222;
+	}
+
+	.productList .list .item .text.on {
+		width: 508rpx;
+		padding: 0 0 0 22rpx;
+	}
+
+	.productList .list .item .text .money {
+		font-size: 26rpx;
+		font-weight: bold;
+		margin-top: 8rpx;
+	}
+
+	.productList .list .item .text .money.on {
+		margin-top: 50rpx;
+	}
+
+	.productList .list .item .text .money .num {
+		font-size: 34rpx;
+	}
+
+	.productList .list .item .text .vip {
+		font-size: 22rpx;
+		color: #aaa;
+		margin-top: 7rpx;
+	}
+
+	.productList .list .item .text .vip.on {
+		margin-top: 12rpx;
+	}
+
+	.productList .list .item .text .vip .vip-money {
+		font-size: 24rpx;
+		color: #282828;
+		font-weight: bold;
+	}
+
+	.productList .list .item .text .vip .vip-money image {
+		width: 46rpx;
+		height: 21rpx;
+		margin-left: 4rpx;
+	}
+
+	.pictrue {
+		position: relative;
+	}
+
+	.fixed {
+		z-index: 100;
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: linear-gradient(90deg, red 50%, #ff5400 100%);
+
+	}
+
+	.mores-txt {
+		width: 100%;
+		align-items: center;
+		justify-content: center;
+		height: 70rpx;
+		color: #999;
+		font-size: 24rpx;
+
+		.iconfont {
+			margin-top: 2rpx;
+			font-size: 20rpx;
+		}
+	}
+
+	.menu-txt {
+		font-size: 24rpx;
+		color: #454545;
+	}
+
+	.mp-bg {
+		position: absolute;
+		left: 0;
+		/* #ifdef H5 */
+		top: 98rpx;
+		/* #endif */
+		width: 100%;
+		height: 304rpx;
+		background: linear-gradient(180deg, #E93323 0%, #F5F5F5 100%, #751A12 100%);
+		// border-radius: 0 0 30rpx 30rpx;
+	}
+</style>
diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index 554e32cac..40c7c78f6 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -1,162 +1,86 @@
 <template>
-	<view>
-		<view class="page-index" :class="{'bgf':navIndex >0}">
-			<!-- #ifdef H5 -->
-			<view class="header">
-				<view class="serch-wrapper flex">
-					<view class="logo">
-						<image :src="logoUrl" mode=""></image>
+	<view class="box">
+		<view class="header">
+			<view class="header_top">
+				<view class="content">
+					<view class="left">
+						<u--image class="image" :src="tenant.logo" width="160rpx" height="160rpx" shape="circle"></u--image>
 					</view>
-					<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text
-							class="iconfont icon-xiazai5"></text>
-						搜索商品</navigator>
-				</view>
-			</view>
-			<!-- #endif -->
-			<!-- #ifdef MP -->
-			<view class="mp-header">
-				<view class="sys-head" :style="{ height: statusBarHeight }"></view>
-				<view class="serch-box" style="height: 40px;">
-					<view class="serch-wrapper flex">
-						<view class="logo">
-							<image :src="logoUrl" mode=""></image>
+					<view class="center">
+						<view class="top">{{tenant.name}}</view>
+						<view class="text">
+							<view class="detail"><u-icon style="display: inline-block;line-height: 28rpx;" name="file-text-fill" color="#fff" size="28rpx"></u-icon>简介:{{tenant.introduction}}</view>
+							<view class="detail"><u-icon style="display: inline-block;line-height: 28rpx;" name="phone" color="#fff" size="28rpx"></u-icon>电话:{{tenant.serviceMobile}}</view>
+							<view class="detail"><u-icon style="display: inline-block;line-height: 28rpx;" name="clock" color="#fff" size="28rpx"></u-icon>服务时间:{{tenant.serviceTime}}</view>
 						</view>
-						<navigator url="/pages/goods_search/index" class="input" hover-class="none"><text
-								class="iconfont icon-xiazai5"></text>
-							搜索商品</navigator>
+					</view>
+					<view class="right">
+						<view class="up"></view>
+						<text>会员等级3级</text>
+						<view class="button">查看权益</view>
 					</view>
 				</view>
 			</view>
-			<!-- #endif -->
-			<!-- 首页展示 -->
-			<view class="page_content" :style="'margin-top:'+(marTop)+'px;'" v-if="navIndex == 0">
-				<view class="mp-bg"></view>
-				<!-- banner -->
-				<view class="swiper" v-if="imgUrls.length">
-					<swiper indicator-dots="true" :autoplay="true" :circular="circular" :interval="interval"
-						:duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-						<block v-for="(item,index) in imgUrls" :key="index">
-							<swiper-item>
-								<navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper'
-									hover-class='none'>
-									<image :src="item.pic" class="slide-image" lazy-load></image>
-								</navigator>
-							</swiper-item>
-						</block>
-					</swiper>
+			<view class="header_bottom">
+				<navigator :url="bannerList.url">
+					<image :src="bannerList.picUrl" mode=""></image>
+				</navigator>
+			</view>
+		</view>
+		<view class="notice">
+			<u-notice-bar :text="text" fontSize="26rpx" color="#000" bgColor="transparent"></u-notice-bar>
+		</view>
+		<view class="hot">
+			<view class="contain"></view>
+			<view class="top">
+				<view class="left">
+					<view class="icon"></view>
+					<text>聚划算</text>
 				</view>
-				<!-- 新闻简报 -->
-				<view class='notice acea-row row-middle row-between' v-if="roll.length">
-					<view class="pic">
-						<image src="/static/images/xinjian.png"></image>
-					</view>
-					<text class='line'>|</text>
-					<view class='swipers'>
-						<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" interval="2500" duration="500" vertical="true"
-						 circular="true">
-							<block v-for="(item,index) in roll" :key='index'>
-								<swiper-item>
-									<navigator class='item' :url='item.url' hover-class='none'>
-										<view class='line1'>{{item.info}}</view>
-									</navigator>
-								</swiper-item>
-							</block>
-						</swiper>
-					</view>
-					<view class="iconfont icon-xiangyou"></view>
-				</view>
-				<!-- menu -->
-				<view class='nav acea-row' v-if="menus.length">
-					<block v-for="(item,index) in menus" :key="index">
-						<navigator class='item' v-if="item.show == '1'" :url='item.url' open-type='switchTab'
-							hover-class='none'>
-							<view class='pictrue'>
-								<image :src='item.pic'></image>
-							</view>
-							<view class="menu-txt">{{item.name}}</view>
-						</navigator>
-						<navigator class='item' v-else :url='item.url' hover-class='none'>
-							<view class='pictrue'>
-								<image :src='item.pic'></image>
-							</view>
-							<view class="menu-txt">{{item.name}}</view>
-						</navigator>
-					</block>
-				</view>
-				<!-- 优惠券 -->
-				<view class="couponIndex" v-if="couponList.length>0">
-					<view class="acea-row" style="height: 100%;">
-						<view class="titBox">
-							<view class="tit1">领取优惠券</view>
-							<view class="tit2">福利大礼包，省了又省</view>
-							<navigator class='item' url='/pages/users/user_get_coupon/index' hover-class='none'>
-								<view class="tit3">查看全部 <text class="iconfont icon-xiangyou"></text></view>
-							</navigator>
+				<view class="right">
+					<view class="search">
+						<view class="icon">
+							
 						</view>
-						<view class="listBox acea-row">
-							<view class="list" :class='item.isUse ? "listHui" : "listActive" ' v-for="(item, index) in couponList.slice(0,2)" :key="index">
-								<view class="tit line1" :class='item.isUse ? "pricehui" : "titActive" '>{{item.name}}</view>
-								<view class="price" :class='item.isUse ? "pricehui" : "icon-color" '>{{item.money?Number(item.money):''}}<text class="yuan">元</text></view>
-								<view class="ling" v-if="!item.isUse" :class='item.isUse ? "pricehui" : "icon-color" '  @click="getCoupon(item.id,index)">领取</view>
-								<view class="ling" v-else :class='item.isUse ? "pricehui fonthui" : "icon-color" '>已领取</view>
-								<view class="priceM">满{{item.minPrice?Number(item.minPrice):''}}元可用</view>
-							</view>
+						<view class="input">
+							<u--input
+							    placeholder="请输入内容"
+							    v-model="value"
+							    @change="change"
+							  ></u--input>
 						</view>
-
-					</view>
-				</view>
-				<!-- 活动-->
-				<a_seckill></a_seckill>
-				<b_combination></b_combination>
-				<c_bargain></c_bargain>
-
-				<!-- 首页推荐 -->
-				<!-- :class="iSshowH?'on':''" -->
-				<view class="sticky-box" :style="'top:'+(marTop)+'px;'">
-					<scroll-view class="scroll-view_H" style="width: 100%;" scroll-x="true" scroll-with-animation
-						:scroll-left="tabsScrollLeft" @scroll="scroll">
-						<view class="tab nav-bd" id="tab_list">
-							<view id="tab_item" :class="{ 'active': listActive == index}" class="item"
-								v-for="(item, index) in explosiveMoney" :key="index" @click="ProductNavTab(item,index)">
-								<view class="txt">{{item.name}}</view>
-								<view class="label">{{item.info}}</view>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-
-				<!-- 首发新品 -->
-				<view class="index-product-wrapper" :class="iSshowH?'on':''">
-					<view class="list-box animated" :class='tempArr.length > 0?"fadeIn on":""'>
-						<view class="item" v-for="(item,index) in tempArr" :key="index" @click="goDetail(item)">
-							<view class="pictrue">
-								<span class="pictrue_log pictrue_log_class"
-									v-if="item.activityH5 && item.activityH5.type === '1'">秒杀</span>
-								<span class="pictrue_log pictrue_log_class"
-									v-if="item.activityH5 && item.activityH5.type === '2'">砍价</span>
-								<span class="pictrue_log pictrue_log_class"
-									v-if="item.activityH5 && item.activityH5.type === '3'">拼团</span>
-								<image :src="item.image" mode=""></image>
-							</view>
-							<view class="text-info">
-								<view class="title line1">{{item.storeName}}</view>
-								<view class="old-price"><text>¥{{item.otPrice}}</text></view>
-								<view class="price">
-									<text>￥</text>{{item.price}}
-									<view class="txt" v-if="item.checkCoupon">券</view>
-								</view>
-							</view>
+						<view class="button" @tap="searchSubmitValue">
+							搜索
 						</view>
 					</view>
-					<view class='loadingicon acea-row row-center-wrapper' v-if="goodScroll">
-						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-					</view>
-					<view class="mores-txt flex" v-if="!goodScroll">
-						<text>我是有底线的</text>
-					</view>
+				</view>
+			</view>
+			<view class="bottom">
+				<view class="item">
+					<image src="@/static/images/shop/index_cart.png"></image>
+					<view class="title">爆款秒杀</view>
+					<image class="img1" src="@/static/images/shop/shoes.png" mode=""></image>
+					<image class="img2" src="@/static/images/shop/cloth.png" mode=""></image>
+				</view>
+				<view class="item">
+					<image src="@/static/images/shop/index_cart.png"></image>
+					<view class="title rank">排行榜</view>
+					<image class="img1" src="@/static/images/shop/shoes.png" mode=""></image>
+					<image class="img2" src="@/static/images/shop/cloth.png" mode=""></image>
 				</view>
 			</view>
 		</view>
+		<view class="container">
+		        <view class="item" v-for="item in productList" @click="goDetail(item)">
+		        	<image :src="item.image" mode=""></image>
+					<view class="name">{{item.storeName}}</view>
+					
+					<text><u--text color="#E50202" mode="price" :text="item.price"></u--text></text>
+		        </view>
+		    </view>
+			<view class="" style="margin-top: 110rpx;">
+				
+			</view>
 	</view>
 </template>
 
@@ -170,10 +94,20 @@
 		getCoupons,
 		setCouponReceive
 	} from '@/api/api.js';
+	import {
+		productPage,
+		getSpuDetail,
+		getBanner,
+		getTenant
+	} from '../../api/product.js'
+	import {
+		postCartAdd
+	} from '../../api/store.js'
 	// #ifdef MP-WEIXIN
 	import {
 		getTemlIds
 	} from '@/api/api.js';
+	
 	// import {
 	// 	SUBSCRIBE_MESSAGE,
 	// 	TIPS_KEY
@@ -208,9 +142,10 @@
 		getProductHot,
 		getGroomList
 	} from '@/api/store.js';
-	// import {
-	// 	setVisit
-	// } from '@/api/user.js'
+	import {
+		setVisit,
+		getUserInfo
+	} from '@/api/user.js'
 	import recommend from '@/components/recommend';
 	// #ifdef MP
 	import authorize from '@/components/Authorize';
@@ -255,15 +190,18 @@
 				navIndex: 0,
 				navTop: [],
 				followUrl: "",
+				value: '',
 				followHid: true,
 				followCode: false,
 				logoUrl: "",
+				bannerList: {},
 				imgUrls: [],
 				itemNew: [],
 				menus: [],
 				bastInfo: '',
 				fastInfo: '',
 				fastList: [],
+				text:'尊敬的业主：接环卫所通知，近期将对小区进行大扫除，请大家做好准备',
 				firstInfo: '',
 				salesInfo: '',
 				indicatorDots: false,
@@ -277,6 +215,7 @@
 				newGoodsBananr: '',
 				couponList: [],
 				liveList: [],
+				productList: [],
 				hotList: [{
 					pic: '/static/images/hot_001.png'
 				}, {
@@ -302,6 +241,7 @@
 				explosiveMoney: [],
 				prodeuctTop: 0,
 				searchH: 0,
+				userInfo: {},
 				isFixed: false,
 				goodType: 0, //精品推荐Type
 				goodScroll: true, //精品推荐开关
@@ -316,6 +256,7 @@
 				configApi: {}, //分享类容配置
 				spikeList: [], // 秒杀
 				point: '',
+				tenant: {},
 				privacyStatus: false, // 隐私政策是否同意过
 				tabsScrollLeft: 0, // tabs当前偏移量
 				scrollLeft: 0,
@@ -373,6 +314,15 @@
 			// Promise.all([this.getAllCategory(), this.getIndexConfig()
 			// 	// , this.setVisit()
 			// ]);
+			getUserInfo().then(res => {
+				this.userInfo = res.data
+				getTenant(153).then(res=>{
+					this.tenant = res.data
+					this.text = res.data.notice
+				})
+			})
+			this.getBanners()
+			this.getIndexPage()
 			this.getIndexConfig();
 			// #ifdef MP
 			this.getTemlIds()
@@ -385,6 +335,49 @@
 			})
 		},
 		methods: {
+			change(){
+				console.log(this.value,'value')
+			},
+			// 搜索
+			searchSubmitValue: function() {
+				if (this.value.length > 0)
+					uni.navigateTo({
+						url: '/pages/goods_list/index?searchValue=' + this.value
+					})
+				else
+					return this.$util.Tips({
+						title: '请填写要搜索的产品信息'
+					});
+			},
+			// 加入购物车
+			addCart(id){
+				getSpuDetail(id).then(res => {
+					console.log(res.data.productValue.默认.id,'1111111111111')
+					let unique = res.data.productValue.默认.id
+					postCartAdd({
+						productId: id,
+						productAttrUnique: unique,
+						cartNum: 1
+					}).then(res=> {
+						console.log('加入成功')
+					})
+				})
+			},
+			go(){
+				console.log(this.productList,'------')
+			},
+			
+			// 获取banner和userInfo
+			getBanners(){
+				
+				// console.log(this.$store.tenantId,'tenantId')
+				getBanner().then(res=>{
+					this.bannerList = res.data.list[0]
+					console.log(this.bannerList,'banner')
+				})
+				console.log(this.userInfo.userId,'userInfo111111')
+				
+			},
 			getCoupon: function(id, index) {
 				let that = this;
 				//领取优惠券
@@ -490,12 +483,22 @@
 					this.getGroomList();
 					this.shareApi();
 					this.getcouponList();
+					
 					// #ifdef H5
 					// that.subscribe = res.data.subscribe;
 					// #endif
 
 				})
 			},
+			// 首页商品
+			getIndexPage(){
+				let that = this
+				productPage().then(res=>{
+					console.log(res.data.list,'商品列表')
+					this.productList = this.productList.concat(res.data.list)
+					console.log(this.productList,'---------')
+				})
+			},
 			getcouponList() {
 				let that = this;
 				getCoupons({
@@ -687,687 +690,299 @@
 	}
 </style>
 <style lang="scss">
-	.notice{
+.box {
+	.header {
+		position: relative;
 		width: 100%;
-		height: 70rpx;
-		border-radius: 10rpx;
-		background-color: #fff;
-		margin-bottom: 25rpx;
-		line-height: 70rpx;
-		padding: 0 14rpx;
-		.line {
-			color: #CCCCCC;
-		}
-		.pic{
-			width: 130rpx;
-			height: 36rpx;
-			image{
-				width: 100%;
-				height: 100%;
-				display: block !important;
-			}
-		}
-		.swipers {
-			height: 100%;
-			width: 444rpx;
-			overflow: hidden;
-			swiper {
-				height: 100%;
-				width: 100%;
-				overflow: hidden;
-				font-size: 22rpx;
-				color: #333333;
-			}
-		}
-		.iconfont {
-			color: #999999;
-			font-size: 20rpx;
-		} 
-	}
-	.couponIndex {
-		width: auto;
-		height: 238rpx;
-		background-image: url('~@/static/images/yhjsy.png');
+		height: 544rpx;
+		background: url(@/static/images/shop/index_headerbg.png);
 		background-size: 100% 100%;
-		padding-left: 42rpx;
-		margin-bottom: 30rpx;
-		
-		.titBox {
-			padding: 47rpx 0;
-			text-align: center;
-			height: 100%;
-
-			.tit1 {
-				color: #FFEBD2;
-				font-size: 34rpx;
-				font-weight: 600;
-			}
-
-			.tit2 {
-				color: #FFEBD2;
-				font-size: 22rpx;
-				margin:10rpx 0 26rpx 0;
-			}
-
-			.tit3 {
-				color: #FFDAAF;
-				font-size: 24rpx;
-				.iconfont {
-					font-size: 20rpx;
-				}
-			}
-		}
-
-		.listBox {
-			padding: 14rpx 0;
-
-			.listActive {
-				background-image: url('~@/static/images/lingyhj.png');
-				background-size: 100% 100%;
-			}
-
-			.listHui {
-				background-image: url('~@/static/images/weiling.png');
-				background-size: 100% 100%;
-			}
-
-			.list {
-				width: 170rpx;
-				height: 210rpx;
-				padding: 16rpx 0;
-				text-align: center;
-				margin-left: 24rpx;
-
-				.tit {
-					font-size: 18rpx;
-					padding: 0 26rpx;
-				}
-
-				.titActive {
-					color: #C99959;
-				}
-
-				.price {
-					font-size: 46rpx;
-					font-weight: 900;
-					margin-top: 4rpx;
-				}
-
-				.pricehui {
-					color: #B2B2B2;
-				}
-                .fonthui{
-					background-color: #F5F5F5 !important;
-				}
-				.yuan {
-					font-size: 24rpx;
-				}
-
-				.ling {
-					font-size: 24rpx;
-					margin-top: 9.5rpx;
-					width: 102rpx;
-					height: 36rpx;
-					line-height: 36rpx;
-					background-color: #FFE5C7;
-					border-radius: 28rpx;
-					margin: auto;
-				}
-
-				.priceM {
-					color: #FFDAAF;
-					font-size: 22rpx;
-					margin-top: 14rpx;
-				}
-			}
-		}
-	}
-
-	.sticky-box {
-		/* #ifndef APP-PLUS-NVUE */
-		display: flex;
-		position: -webkit-sticky;
-		/* #endif */
-		position: sticky;
-		/* #ifdef H5*/
-		top: var(--window-top);
-		/* #endif */
-		
-		z-index: 99;
-		flex-direction: row;
-		margin: 0px;
-		background: #f5f5f5;
-		padding: 30rpx 0;
-	}
-
-	.listAll {
-		width: 20%;
-		text-indent: 62rpx;
-		font-size: 30rpx;
-		border-left: 1px #eee solid;
-		margin: 1% 0;
-		padding: 5rpx;
-		position: relative;
-
-		image {
-			position: absolute;
-			left: 20rpx;
-			top: 8rpx;
-		}
-	}
-
-	.tab {
-		position: relative;
-		display: flex;
-		font-size: 28rpx;
-		white-space: nowrap;
-
-		&__item {
-			flex: 1;
-			padding: 0 20rpx;
-			text-align: center;
-			height: 60rpx;
-			line-height: 60rpx;
-			color: #666;
-
-			&.active {
-				color: #09C2C9;
-			}
-		}
-	}
-
-	.tab__line {
-		display: block;
-		height: 6rpx;
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		z-index: 1;
-		border-radius: 3rpx;
-		position: relative;
-		background: #2FC6CD;
-	}
-
-	.scroll-view_H {
-		/* 文本不会换行，文本会在在同一行上继续，直到遇到 <br> 标签为止。 */
-		white-space: nowrap;
-		width: 100%;
-	}
-
-
-	.privacy-wrapper {
-		z-index: 999;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		background: #7F7F7F;
-
-		.privacy-box {
-			position: absolute;
-			left: 50%;
-			top: 50%;
-			transform: translate(-50%, -50%);
-			width: 560rpx;
-			padding: 50rpx 45rpx 0;
-			background: #fff;
-			border-radius: 20rpx;
-
-			.title {
-				text-align: center;
-				font-size: 32rpx;
-				text-align: center;
-				color: #333;
-				font-weight: 700;
-			}
+		.header_top {
+			position: relative;
+			width: 100%;
+			height: 457rpx;
 
 			.content {
-				margin-top: 20rpx;
-				line-height: 1.5;
-				font-size: 26rpx;
-				color: #666;
-				text-indent: 54rpx;
-
-				i {
-					font-style: normal;
-					color: $theme-color;
-				}
-			}
-
-			.btn-box {
-				margin-top: 40rpx;
-				text-align: center;
-				font-size: 30rpx;
-
-				.btn-item {
-					height: 82rpx;
-					line-height: 82rpx;
-					background: linear-gradient(90deg, #F67A38 0%, #F11B09 100%);
-					color: #fff;
-					border-radius: 41rpx;
-				}
-
-				.btn {
-					padding: 30rpx 0;
-				}
-			}
-		}
-	}
-
-	.page-index {
-		display: flex;
-		flex-direction: column;
-		min-height: 100%;
-		background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
-
-		.header {
-			width: 100%;
-			background-color: $theme-color;
-			padding: 28rpx 30rpx;
-
-			.serch-wrapper {
-				align-items: center;
-
-
-				.logo {
-					width: 118rpx;
-					height: 42rpx;
-					margin-right: 24rpx;
-				}
-
-				image {
-					width: 118rpx;
-					height: 42rpx;
-				}
-
-				.input {
-					display: flex;
-					align-items: center;
-					width: 546rpx;
-					height: 58rpx;
-					padding: 0 0 0 30rpx;
-					background: rgba(247, 247, 247, 1);
-					border: 1px solid rgba(241, 241, 241, 1);
-					border-radius: 29rpx;
-					color: #BBBBBB;
-					font-size: 26rpx;
-
-					.iconfont {
-						margin-right: 20rpx;
-						font-size: 26rpx;
-						color: #666666;
-					}
-				}
-			}
-
-			.tabNav {
-				padding-top: 24rpx;
-			}
-		}
-
-		/* #ifdef MP */
-		.mp-header {
-			z-index: 999;
-			position: fixed;
-			left: 0;
-			top: 0;
-			width: 100%;
-			/* #ifdef H5 */
-			padding-bottom: 20rpx;
-			/* #endif */
-			background-color: $theme-color;
-
-			.serch-wrapper {
-				height: 100%;
-				align-items: center;
-				padding: 0 50rpx 0 53rpx;
-
-				image {
-					width: 118rpx;
-					height: 42rpx;
-					margin-right: 30rpx;
-				}
-
-				.input {
-					display: flex;
-					align-items: center;
-					/* #ifdef MP */
-					width: 305rpx;
-					/* #endif */
-					height: 50rpx;
-					padding: 0 0 0 30rpx;
-					background: rgba(247, 247, 247, 1);
-					border: 1px solid rgba(241, 241, 241, 1);
-					border-radius: 29rpx;
-					color: #BBBBBB;
-					font-size: 28rpx;
-
-					.iconfont {
-						margin-right: 20rpx;
-					}
-				}
-			}
-		}
-
-		/* #endif */
-
-		.page_content {
-			background-color: #f5f5f5;
-			/* #ifdef H5 */
-			// margin-top: 20rpx !important;
-			/* #endif */
-			padding: 0 30rpx;
-
-			.swiper {
-				position: relative;
 				width: 100%;
-				height: 280rpx;
-				margin: 0 auto;
-				border-radius: 10rpx;
-				overflow: hidden;
-				margin-bottom: 25rpx;
-				/* #ifdef MP */
-				z-index: 10;
-				margin-top: 20rpx;
-
-				/* #endif */
-				swiper,
-				.swiper-item,
-				image {
-					width: 100%;
-					height: 280rpx;
-					border-radius: 10rpx;
-				}
-			}
-
-			.nav {
-				padding-bottom: 26rpx;
-				background: #fff;
-				opacity: 1;
-				border-radius: 14rpx;
-				width: 100%;
-				margin-bottom: 30rpx;
-
-				.item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					width: 20%;
-					margin-top: 30rpx;
-
-					image {
-						width: 82rpx;
-						height: 82rpx;
-					}
-				}
-			}
-
-
-			.nav-bd {
 				display: flex;
+				justify-content: space-around;
 				align-items: center;
-				justify-content: space-between;
-
-				.item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-					.txt {
-						font-size: 32rpx;
-						color: #282828;
+				position: absolute;
+				top: 109rpx;
+				.left {
+					width: 164rpx;
+					height: 164rpx;
+						
+					.image {
+						border: 3rpx solid #EE5423;
+						border-radius: 50%;
+						border: linear-gradient(0deg, #F77C4D, #EE5423);
 					}
-
-					.label {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						width: 124rpx;
-						height: 32rpx;
-						margin-top: 5rpx;
-						font-size: 24rpx;
-						color: #999;
+					
+				}
+				.center {
+					width: 330rpx;
+					height: 170rpx;
+					.top {
+						font-size: 30rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #FFFFFF;
 					}
-
-					&.active {
-						color: $theme-color;
-
-						.txt {
-							color: $theme-color;
-						}
-
-						.label {
-							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-							border-radius: 16rpx;
-							color: #fff;
+					.text {
+						margin-top: 25rpx;
+						.detail {
+							font-size: 24rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #FFFFFF;
 						}
 					}
 				}
-			}
-
-			.index-product-wrapper {
-				margin-bottom: 110rpx;
-
-				&.on {
-					min-height: 1500rpx;
-				}
-
-				.list-box {
+				.right {
+					width: 150rpx;
+					height: 170rpx;
 					display: flex;
+					justify-content: space-around;
 					flex-wrap: wrap;
-					justify-content: space-between;
-
-					.item {
-						width: 335rpx;
-						margin-bottom: 20rpx;
-						background-color: #fff;
-						border-radius: 10rpx;
-						overflow: hidden;
-
-						image {
-							width: 100%;
-							height: 330rpx;
-						}
-
-						.text-info {
-							padding: 10rpx 20rpx 15rpx;
-
-							.title {
-								color: #222222;
-							}
-
-							.old-price {
-								margin-top: 8rpx;
-								font-size: 26rpx;
-								color: #AAAAAA;
-								text-decoration: line-through;
-
-								text {
-									margin-right: 2px;
-									font-size: 20rpx;
-								}
-							}
-
-							.price {
-								display: flex;
-								align-items: flex-end;
-								color: $theme-color;
-								font-size: 34rpx;
-								font-weight: 800;
-
-								text {
-									padding-bottom: 4rpx;
-									font-size: 24rpx;
-									font-weight: 800;
-								}
-
-								.txt {
-									display: flex;
-									align-items: center;
-									justify-content: center;
-									width: 28rpx;
-									height: 28rpx;
-									margin-left: 15rpx;
-									margin-bottom: 10rpx;
-									border: 1px solid $theme-color;
-									border-radius: 4rpx;
-									font-size: 22rpx;
-									font-weight: normal;
-								}
-							}
-						}
+					align-items: center;
+					.up {
+						width: 90rpx;
+						height: 100rpx;
+						background: #EE5423;
 					}
-
-					&.on {
-						display: flex;
+					text {
+						font-size: 22rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #FFFFFF;
+					}
+					.button {
+						width: 119rpx;
+						height: 36rpx;
+						border-radius: 18rpx;
+						background: #F22E60;
+						text-align: center;
+						line-height: 36rpx;
+						font-size: 22rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #FFFFFF;
 					}
 				}
 			}
 		}
-	}
-
-	.productList {
-		/* #ifdef H5 */
-		padding-bottom: 140rpx;
-		/* #endif */
-	}
-
-	.productList .list {
-		padding: 0 20rpx;
-	}
-
-	.productList .list.on {
-		background-color: #fff;
-		border-top: 1px solid #f6f6f6;
-	}
-
-	.productList .list .item {
-		width: 345rpx;
-		margin-top: 20rpx;
-		background-color: #fff;
-		border-radius: 10rpx;
-	}
-
-	.productList .list .item.on {
-		width: 100%;
-		display: flex;
-		border-bottom: 1rpx solid #f6f6f6;
-		padding: 30rpx 0;
-		margin: 0;
-	}
-
-	.productList .list .item .pictrue {
-		position: relative;
-		width: 100%;
-		height: 345rpx;
-	}
-
-	.productList .list .item .pictrue.on {
-		width: 180rpx;
-		height: 180rpx;
-	}
-
-	.productList .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-
-	.productList .list .item .pictrue image.on {
-		border-radius: 6rpx;
-	}
-
-	.productList .list .item .text {
-		padding: 20rpx 17rpx 26rpx 17rpx;
-		font-size: 30rpx;
-		color: #222;
-	}
-
-	.productList .list .item .text.on {
-		width: 508rpx;
-		padding: 0 0 0 22rpx;
-	}
-
-	.productList .list .item .text .money {
-		font-size: 26rpx;
-		font-weight: bold;
-		margin-top: 8rpx;
-	}
-
-	.productList .list .item .text .money.on {
-		margin-top: 50rpx;
-	}
-
-	.productList .list .item .text .money .num {
-		font-size: 34rpx;
-	}
-
-	.productList .list .item .text .vip {
-		font-size: 22rpx;
-		color: #aaa;
-		margin-top: 7rpx;
-	}
-
-	.productList .list .item .text .vip.on {
-		margin-top: 12rpx;
-	}
-
-	.productList .list .item .text .vip .vip-money {
-		font-size: 24rpx;
-		color: #282828;
-		font-weight: bold;
-	}
-
-	.productList .list .item .text .vip .vip-money image {
-		width: 46rpx;
-		height: 21rpx;
-		margin-left: 4rpx;
-	}
-
-	.pictrue {
-		position: relative;
-	}
-
-	.fixed {
-		z-index: 100;
-		position: fixed;
-		left: 0;
-		top: 0;
-		background: linear-gradient(90deg, red 50%, #ff5400 100%);
-
-	}
-
-	.mores-txt {
-		width: 100%;
-		align-items: center;
-		justify-content: center;
-		height: 70rpx;
-		color: #999;
-		font-size: 24rpx;
-
-		.iconfont {
-			margin-top: 2rpx;
-			font-size: 20rpx;
+		.header_bottom {
+			position: absolute;
+			margin-left: 43rpx;
+			bottom: 0;
+			width: 664rpx;
+			height: 238rpx;
+			// background: url(@/static/images/shop/index_hbottom.png);
+			// background-size: 100% 100%;
+			image {
+				width: 664rpx;
+				height: 238rpx;
+				border-radius: 20rpx;
+			}
 		}
 	}
-
-	.menu-txt {
-		font-size: 24rpx;
-		color: #454545;
+	.notice {
+		margin-top: 30rpx;
+		margin-left: 48rpx;
+		width: 658rpx;
+		height: 67rpx;
+		background: #fff;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
 	}
-
-	.mp-bg {
-		position: absolute;
-		left: 0;
-		/* #ifdef H5 */
-		top: 98rpx;
-		/* #endif */
-		width: 100%;
-		height: 304rpx;
-		background: linear-gradient(180deg, #E93323 0%, #F5F5F5 100%, #751A12 100%);
-		// border-radius: 0 0 30rpx 30rpx;
+	.hot {
+		width: 663rpx;
+		height: 322rpx;
+		margin-top: 27rpx;
+		margin-left: 44rpx;
+		background: #fff;
+		border-radius: 20rpx;
+			
+		.contain {
+			width: 100%;
+			height: 1rpx;
+			margin-bottom: 26rpx;
+		}
+		.top {
+			width: 100%;
+			height: 55rpx;
+			display: flex;
+			justify-content: space-between;
+			.left {
+				height: 100%;
+				margin-left: 19rpx;
+				display: flex;
+				justify-content: space-around;
+				.icon {
+					width: 40rpx;
+					height: 40rpx;
+					background: url(@/static/images/shop/index_hot.png);
+					background-size: 100% 100%;
+				}
+				text {
+					margin-left: 11rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #000000;
+				}
+			}
+			.right {
+				width: 387rpx;
+				height: 100%;
+				.search {
+					width: 387rpx;
+					height: 55rpx;
+					border: 1rpx solid #FE7596;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					border-radius: 27rpx;
+					.icon {
+						margin-left: 10rpx;
+						width: 37rpx;
+						height: 31rpx;
+						background: url(@/static/images/shop/index_search.png);
+						background-size: 100% 100%;
+					}
+					.button {
+						margin-right: 3rpx;
+						width: 82rpx;
+						height: 46rpx;
+						line-height: 45rpx;
+						text-align: center;
+						background: linear-gradient(0deg, #F02563 0%, #FE7596 100%);
+						border-radius: 22.5rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+		.bottom {
+			margin-top: 27rpx;
+			height: 200rpx;
+			overflow: scroll;
+			white-space: nowrap;
+			.item {
+				position: relative;
+				display: inline-block;
+				width: 370rpx;
+				height: 199rpx;
+				margin-left: 19rpx;
+				image {
+					width: 370rpx;
+					height: 199rpx;
+				}
+				.title {
+					position: absolute;
+					left: 22rpx;
+					top: 22rpx;
+					width: 116rpx;
+					height: 34rpx;
+					line-height: 34rpx;
+					text-align: center;
+					background: linear-gradient(0deg, #FF4200 0%, #FFB21D 100%);
+					border-radius: 8rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #FFFFFF;
+				}
+				.rank {
+					width: 90rpx;
+					height: 34rpx;
+					line-height: 34rpx;
+					background: linear-gradient(0deg, #F74A7B 0%, #FFAFAF 100%);
+					border-radius: 8rpx;
+				}
+				.img1 {
+					position: absolute;
+					left: 17rpx;
+					top: 81rpx;
+					width: 166rpx;
+					height: 71rpx;
+				}
+				.img2 {
+					position: absolute;
+					top: 22rpx;
+					right: 25rpx;
+					width: 138rpx;
+					height: 132rpx;
+				}
+			}
+		}
 	}
+	.container {
+		width: 663rpx;
+		margin-left: 44rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		.item {
+			position: relative;
+			margin-top: 28rpx;
+			width: 322rpx;
+			height: 404rpx;
+			background: #fff;
+			overflow: hidden;
+			border-radius: 20rpx;
+				
+			image {
+				width: 100%;
+				height: 294rpx;
+			}
+			.name {
+				margin-left: 15rpx;
+				margin-bottom: 10rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+				font-weight: 400;
+				color: #000000;
+			}
+			text {
+				position: absolute;
+				right: 20rpx;
+				bottom: 14rpx;
+				font-size: 28rpx;
+				white-space: nowrap;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #E50202;
+			}
+			.car {
+				position: absolute;
+				
+				width: 60rpx;
+				height: 60rpx;
+				background: url(@/static/images/shop/car.png);
+				background-size: 100% 100%;
+			}
+		}
+	}
+}
+::v-deep .notice{
+	.u-icon__icon {
+			color: #FF4802 !important;
+				
+			span {
+				font-size: 28rpx;
+			}
+} 
+			
+		}
 </style>
diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue
index 92b2bcd13..076524845 100644
--- a/yudao-ui-app/pages/member_application/index.vue
+++ b/yudao-ui-app/pages/member_application/index.vue
@@ -58,16 +58,6 @@
     },
     data() {
       return {
-        			// list: [
-        			// 	{
-        			// 		name:'购买记录',
-        			// 		fontSize:'28'
-        			// 	},
-           //      {
-           //      	name:'为他人充值',
-           //      	fontSize:'28'
-           //      },
-        			// ],
         memberData: [],
         payInfo: {
           userPhone: '',
@@ -106,7 +96,7 @@
         const res = await memberGradeInfo()
              if(res.data.some((item) => !!parseInt(item.isExist))){
                uni.setTabBarItem({
-                 index: 0,
+                 index: 2,
                  pagePath: '/pages/member_equity/index'
                })
                uni.switchTab({
@@ -114,7 +104,7 @@
                })
              }else{
                uni.setTabBarItem({
-                 index: 0,
+                index: 2,
                  pagePath: '/pages/member_application/index'
                })
              }
diff --git a/yudao-ui-app/pages/member_back/index.vue b/yudao-ui-app/pages/member_back/index.vue
new file mode 100644
index 000000000..188fd6127
--- /dev/null
+++ b/yudao-ui-app/pages/member_back/index.vue
@@ -0,0 +1,419 @@
+<template>
+  <view class="box">
+    <view class="box-member">
+      <view class="member-left">
+        <text class="left-title">{{memberDetail.grade}}</text>
+        <view class="left-info">
+          <text>{{userInfo.mobile}}</text>
+          <text>会员积分：{{memberDetail.integral}}</text>
+        </view>
+        <text>再升1级即可获得【XX】等6项权益</text>
+      <view class="left-button">
+          <view class="left-shopping" @click="handleRouter('购买记录')">
+            <text>购买记录</text>
+            <image src="../../static/images/shopping-right.png" ></image>
+          </view>
+           <view class="left-others" @click="handleRouter('为他人充值')">
+            为他人充值
+            <image src="../../static/images/others-right.png" ></image>
+          </view>
+        </view>
+      </view>
+     <view class="member-right">
+        <image src='../../static/images/vipStar.png'></image>
+        <text>会员等级{{vipData.findIndex((item) => item == memberDetail.grade) +1}}级</text>
+        <button @click="handleRenew">立即续费</button>
+      </view>
+    </view>
+    <view class="box-equity">
+      <view class="equity-text">
+        <view >
+          <image src='../../static/images/memberLogo.png'></image>
+          <text class="equity-member">我的会员权益</text>
+        </view>
+        <text class="equity-look">查看权益></text>
+      </view>
+      <view class="equity-item" v-for="(item,index) in equityData" :key="index">
+        <view class="equity-grade">
+          <image :src='list[list.findIndex((i) => item.gear == i.name)].img'></image>
+          <text>办理日期：{{item.startTime}}</text>
+        </view>
+        <view class="equity-money">
+          <view class="money-box money-completed">
+            <text>已返回金额（元）</text>
+            <view>
+              <text class="money-text">{{item.totalMoney}}</text>
+              <text class="money-detailed" @click="handleDetailed(item.reportId)">查看明细></text>
+            </view>
+          </view>
+          <view class="money-box money-treat">
+            <text>带返还金额 (元) </text>
+            <text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].name-item.totalMoney}}</text>
+          </view>
+          <view class="money-box money-term">
+            <text>带返还期额</text>
+            <text class="money-text">{{item.frequency}}x12</text>
+          </view>
+          <view class="money-box money-time">
+            <text>返费结束时间</text>
+            <text class="money-text">{{item.endTime}}</text>
+         </view>
+               </view>
+             </view>
+           </view>
+           <u-navbar leftIcon="" title="会员申请"></u-navbar>
+         </view>
+</template>
+
+<script>
+  import {
+    memberHeadInfo,
+    memberGradeInfo,
+    query
+  } from '@/api/member.js';
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    name: "member_application",
+    data() {
+      return {
+        			list: [
+        				{
+        					img:'../../static/images/member240.png',
+        					name:'360'
+        				},
+                {
+                	img:'../../static/images/member400.png',
+                	name:'600'
+                },
+                {
+                	img:'../../static/images/member960.png',
+                	name:'900'
+                },
+        			],
+              vipData:['普通会员','中级会员','高级会员'],
+        			show: false,
+              memberDetail:{},
+              equityData:[]
+      };
+    },
+    computed: mapGetters(['userInfo']),
+   async onLoad() {
+     const resful = await memberGradeInfo()
+          if(resful.data.some((item) => !!parseInt(item.isExist))){
+            uni.setTabBarItem({
+              index: 0,
+              pagePath: '/pages/member_equity/index'
+            })
+          }else{
+            uni.setTabBarItem({
+              index: 0,
+              pagePath: '/pages/member_application/index'
+            })
+            uni.switchTab({
+              url:'/pages/member_application/index'
+            })
+          }
+     const res = await memberHeadInfo()
+     this.memberDetail = res.data
+     const equity = await query(this.userInfo.mobile)
+      this.equityData = equity.data
+    },
+    methods: {
+      handleDetailed(reportId){
+        uni.navigateTo({
+          url:`/pages/member_detail/index?reportId=${reportId}`,
+        })
+      },
+      handleRenew(){
+        uni.navigateTo({
+            url:'/pages/member_renew/index'
+          })
+      },
+      handleRouter(value){
+        switch (value){
+          case "购买记录":
+          uni.navigateTo({
+            url:'/pages/member_record/index'
+          })
+          break;
+          case "为他人充值":
+          uni.navigateTo({
+            url:'/pages/member_others/index'
+          })
+          break;
+          default:
+          break;
+        }
+      },
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .box {
+    margin-bottom: 30%;
+    margin-top: 10%;
+    background: #fff;
+    height: 100vh;
+    background: url(../../static/images/memberBg.png);
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-attachment: fixed;
+
+      .u-nav-slot{
+      ::v-deep .u-popup__content{
+        padding-bottom: 20% !important;
+
+      }
+    }
+
+
+    .box-member {
+      padding: 36rpx 40rpx;
+      border-radius: 20rpx;
+      width: 100%;
+      // padding: 20rpx 20rpx 30rpx 20rpx;
+      display: flex;
+      justify-content: space-between;
+      line-height: 50rpx;
+      .member-left {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        width: 69%;
+        font-size: 28rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #000000;
+
+        .left-title {
+          font-size: 35rpx;
+          font-family: PingFang SC;
+          font-weight: 600;
+          color: #000000;
+        }
+
+        .left-info {
+          display: flex;
+          justify-content: space-between;
+        }
+        .left-button{
+          display: flex;
+          justify-content: space-between;
+          margin-top: 10rpx;
+          image{
+            width: 24rpx;
+            height: 24rpx;
+            margin-left: 13rpx;
+          }
+          .left-shopping{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+              width: 204rpx;
+              height: 61rpx;
+              background: #F8EFF0;
+              border: 1px solid #F783B0;
+              border-radius: 30rpx;
+              font-size: 28rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+              color: #000000;
+          }
+          .left-others{
+            background-image: url("../../static/images/others-button.png");
+            background-size: 204rpx 61rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+              width: 204rpx;
+              height: 61rpx;
+             font-size: 28rpx;
+             font-family: PingFang SC;
+             font-weight: 400;
+             color: #FFFFFF;
+          }
+        }
+      }
+
+      .member-right {
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        align-items: center;
+        width: 22%;
+        font-size: 22rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #000000;
+
+        image {
+          width: 100rpx;
+          height: 100rpx;
+          border-radius: 50%;
+          margin-bottom: 10rpx;
+        }
+
+        button {
+          margin-top: 10rpx;
+          padding: 7rpx 16rpx;
+          background: #F22E60;
+          border-image: linear-gradient(0deg, #A8052E, #FFFFFF) 10 10;
+          border-radius: 18rpx;
+          font-size: 22rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FFFFFF;
+        }
+      }
+    }
+
+    .box-equity {
+      // border-radius: 20rpx;
+      width: 100%;
+      padding: 0 40rpx;
+      background: url(../../static/images/memberEquity.png);
+      background-size: 100%;
+      background-repeat: no-repeat;
+      display: flex;
+      flex-direction: column;
+      position: relative;
+
+      .equity-text {
+        margin: 5% 0;
+        display: flex;
+        align-items: center;
+        height: 10%;
+        view{
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 44%;
+          image{
+            width: 26rpx;
+            height: 26rpx;
+          }
+        }
+        .equity-member {
+          margin: 0 10%;
+          font-size: 30rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FFFFFF;
+        }
+
+        .equity-look {
+          font-size: 28rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #FF4922;
+        }
+      }
+
+      .equity-item {
+        background: #fff;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        border-radius: 20rpx;
+        margin: 0 20rpx 20rpx 20rpx;
+
+        .equity-grade {
+          border-radius: 10rpx 10rpx;
+          padding: 20rpx;
+          display: flex;
+          justify-content: space-between;
+          font-size: 24rpx;
+          font-family: PingFang SC;
+          font-weight: 400;
+          color: #000000;
+          image{
+            width: 295rpx;
+            height: 35rpx;
+          }
+        }
+
+        .equity-money {
+          display: flex;
+          justify-content: space-around;
+          flex-wrap: wrap;
+
+          .money-box {
+            width: 46%;
+            padding: 24rpx 25rpx;
+            border-radius: 10px;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            font-size: 28rpx;
+            font-family: PingFang SC;
+            font-weight: 400;
+            color: #000000;
+            margin-bottom: 18rpx;
+
+            .money-text {
+              font-size: 30rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+
+            }
+          }
+
+          .money-completed {
+            background: #FFF2F2;
+            border: 1px solid #F22E60;
+
+            .money-text {
+              color: #F91F57;
+            }
+
+            view {
+              margin-top: 26rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              font-size: 24rpx;
+              font-family: PingFang SC;
+              font-weight: 400;
+              color: #000000;
+            }
+          }
+
+          .money-treat {
+            background: #FFFDF1;
+            border: 1px solid #FF962F;
+
+            .money-text {
+              margin-top: 26rpx;
+              color: #EBAF00;
+            }
+          }
+
+          .money-term {
+            background: #F8FFF8;
+            border: 1px solid #38A74F;
+
+            .money-text {
+              margin-top: 26rpx;
+              color: #2C9E2C;
+            }
+          }
+
+          .money-time {
+            background: #F0FDFC;
+            border: 1px solid #5CA4E8;
+
+            .money-text {
+              margin-top: 26rpx;
+              color: #2D7AC9;
+            }
+          }
+        }
+      }
+    }
+
+
+  }
+</style>
diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue
index 31cf1db87..c928c5bbf 100644
--- a/yudao-ui-app/pages/member_equity/index.vue
+++ b/yudao-ui-app/pages/member_equity/index.vue
@@ -103,12 +103,12 @@
      const resful = await memberGradeInfo()
           if(resful.data.some((item) => !!parseInt(item.isExist))){
             uni.setTabBarItem({
-              index: 0,
+              index: 2,
               pagePath: '/pages/member_equity/index'
             })
           }else{
             uni.setTabBarItem({
-              index: 0,
+              index: 2,
               pagePath: '/pages/member_application/index'
             })
             uni.switchTab({
@@ -117,8 +117,7 @@
           }
      const res = await memberHeadInfo()
      this.memberDetail = res.data
-     // this.userInfo.mobile
-     const equity = await query(13668261228)
+     const equity = await query(this.userInfo.mobile)
       this.equityData = equity.data
     },
     methods: {
diff --git a/yudao-ui-app/pages/order_addcart/order_addcart - 副本.vue b/yudao-ui-app/pages/order_addcart/order_addcart - 副本.vue
new file mode 100644
index 000000000..621e35d43
--- /dev/null
+++ b/yudao-ui-app/pages/order_addcart/order_addcart - 副本.vue	
@@ -0,0 +1,1227 @@
+<template>
+	<view>
+		<view class='shoppingCart copy-data'>
+			<view class='labelNav acea-row row-around'>
+				<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="borRadius14 cartBox">
+				<view
+					v-if="(cartList.valid.length === 0 && cartList.invalid.length === 0) || (cartList.valid.length > 0)"
+					class='nav acea-row row-between-wrapper'>
+					<view>购物数量 <text class='num font-color'>{{cartCount}}</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" class="pad30">
+					<view class='list'>
+						<checkbox-group @change="checkboxChange">
+							<block v-for="(item,index) in cartList.valid" :key="index">
+								<view class='item acea-row row-between-wrapper'>
+									<!-- #ifndef MP -->
+									<checkbox :value="(item.id).toString()" :checked="item.checked"
+										:disabled="!item.attrStatus && footerswitch" style="margin-right: 10rpx;" />
+									<!-- #endif -->
+									<!-- #ifdef MP -->
+									<checkbox :value="item.id" :checked="item.checked"
+										:disabled="!item.attrStatus && footerswitch" />
+									<!-- #endif -->
+									<navigator :url='"/pages/goods_details/index?id="+item.productId' hover-class='none'
+										class='picTxt acea-row row-between-wrapper'>
+										<view class='pictrue'>
+											<image :src='item.image'></image>
+										</view>
+										<view class='text'>
+											<view class='line1' :class="item.attrStatus?'':'reColor'">{{item.storeName}}
+											</view>
+											<view class='infor line1' v-if="item.suk">属性：{{item.suk}}</view>
+											<view class='money' v-if="item.attrStatus">￥{{item.price}}</view>
+											<!-- <view class='money' v-if="item.attrStatus">￥{{item.truePrice}}</view> -->
+											<view class="reElection acea-row row-between-wrapper" v-else>
+												<view class="title">请重新选择商品规格</view>
+												<view class="reBnt cart-color acea-row row-center-wrapper"
+													@click.stop="reElection(item)">重选</view>
+											</view>
+										</view>
+										<view class='carnum acea-row row-center-wrapper' v-if="item.attrStatus">
+											<view class="reduce" :class="item.numSub ? 'on' : ''"
+												@click.stop='subCart(index)'>-</view>
+											<view class='num'>{{item.cartNum}}</view>
+											<view class="plus" :class="item.numAdd ? 'on' : ''"
+												@click.stop='addCart(index)'>+</view>
+										</view>
+									</navigator>
+								</view>
+							</block>
+						</checkbox-group>
+					</view>
+					<!-- cartList.valid.length===0 && cartList.invalid.length > 0 -->
+					<view v-if="cartList.invalid.length > 0" class='invalidGoods borRadius14'
+						:style="cartList.valid.length===0 && cartList.invalid.length > 0 ? 'position: relative;z-index: 111;top: -120rpx;':'position: static;'">
+						<view class='goodsNav acea-row row-between-wrapper'>
+							<view v-if="cartList.invalid.length > 1 || cartList.valid.length > 0" @click='goodsOpen'>
+								<text class='iconfont'
+									:class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>失效商品
+							</view>
+							<view v-else>
+								失效商品
+							</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'>
+								<view class='item acea-row row-between-wrapper'>
+									<view class='invalid'>失效</view>
+									<view class='picTxt acea-row row-between-wrapper'>
+										<view class='pictrue'>
+											<image :src='item.image'></image>
+										</view>
+										<view class='text acea-row row-column-between'>
+											<view class='line1 name'>{{item.storeName}}</view>
+											<view class='infor line1' v-if="item.suk">属性：{{item.suk}}</view>
+											<view class='acea-row row-between-wrapper'>
+												<view class='end'>该商品已失效</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</block>
+						</view>
+					</view>
+					<!-- <view class='loadingicon acea-row row-center-wrapper' v-if="cartList.valid.length&&!loadend">
+						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+					</view> -->
+					<view class='loadingicon acea-row row-center-wrapper' v-if="cartList.invalid.length&&loadend">
+						<text class='loading iconfont icon-jiazai'
+							:hidden='loadingInvalid==false'></text>{{loadTitleInvalid}}
+					</view>
+				</view>
+				<view class='noCart' v-if="cartList.valid.length == 0 && cartList.invalid.length == 0 && canShow">
+					<view class='pictrue'>
+						<image src='../../static/images/noCart.png'></image>
+					</view>
+					<recommend :hostProduct='hostProduct'></recommend>
+				</view>
+			</view>
+		</view>
+		<view class='footer acea-row row-between-wrapper' v-if="cartList.valid.length > 0">
+			<view>
+				<checkbox-group @change="checkboxAllChange">
+					<checkbox value="all" :checked="!!isAllSelect" />
+					<text class='checkAll'>全选({{selectValue.length}})</text>
+				</checkbox-group>
+			</view>
+			<view class='money acea-row row-middle' v-if="footerswitch==true">
+				<text class='font-color'>￥{{selectCountPrice}}</text>
+				<form @submit="subOrder" report-submit='true'>
+					<button class='placeOrder bg-color' formType="submit">立即下单</button>
+				</form>
+			</view>
+			<view class='button acea-row row-middle' v-else>
+				<form @submit="subCollect" report-submit='true'>
+					<button class='bnt cart-color' formType="submit">收藏</button>
+				</form>
+				<form @submit="subDel" report-submit='true'>
+					<button class='bnt' formType="submit">删除</button>
+				</form>
+			</view>
+		</view>
+		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
+			@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="reGoCat"
+			id='product-window'></productWindow>
+		<view class="uni-p-b-96"></view>
+		<view class="uni-p-b-98"></view>
+		<!-- #ifdef MP -->
+		<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script>
+	let sysHeight = 0
+	import {
+		getCartList,
+		getCartCounts,
+		changeCartNum,
+		cartDel,
+		getResetCart
+	} from '@/api/order.js';
+	import {
+		getProductHot,
+		collectAll,
+		getProductDetail
+	} from '@/api/store.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import recommend from '@/components/recommend';
+	import productWindow from '@/components/productWindow';
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	export default {
+		components: {
+			recommend,
+			productWindow,
+			// #ifdef MP
+			authorize
+			// #endif
+		},
+		data() {
+			return {
+				cartCount: 0,
+				goodsHidden: false,
+				footerswitch: true,
+				hostProduct: [],
+				cartList: {
+					valid: [],
+					invalid: []
+				},
+				isAllSelect: false, //全选
+				selectValue: [], //选中的数据
+				selectCountPrice: 0.00,
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				hotScroll: false,
+				hotPage: 1,
+				hotLimit: 10,
+				loading: false,
+				loadend: false,
+				loadTitle: '加载更多', //提示语
+				page: 1,
+				limit: 20,
+				loadingInvalid: false,
+				loadendInvalid: false,
+				loadTitleInvalid: '加载更多', //提示语
+				pageInvalid: 1,
+				limitInvalid: 20,
+				attr: {
+					cartAttr: false,
+					productAttr: [],
+					productSelect: {}
+				},
+				productValue: [], //系统属性
+				productInfo: {},
+				attrValue: '', //已选属性
+				attrTxt: '请选择', //属性页面提示
+				cartId: 0,
+				product_id: 0,
+				sysHeight: sysHeight,
+				canShow: false
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		// onLoad: function(options) {
+		// 	let that = this;
+		// 	if (that.isLogin == false) {
+		// 		toLogin();
+		// 	}
+		// },
+		onShow: function() {
+			this.canShow = false
+			if (this.isLogin == true) {
+				this.hotPage = 1;
+				this.hostProduct = [],
+					this.hotScroll = false,
+					this.loadend = false;
+				this.page = 1;
+				this.cartList.valid = [];
+				this.getCartList();
+				this.loadendInvalid = false;
+				this.pageInvalid = 1;
+				this.cartList.invalid = [];
+				this.getInvalidList();
+				//this.getCartNum();
+				this.footerswitch = true;
+				this.hotScroll = false;
+				this.hotPage = 1;
+				this.hotLimit = 10;
+				this.cartList = {
+						valid: [],
+						invalid: []
+					},
+					this.isAllSelect = false; //全选
+				this.selectValue = []; //选中的数据
+				this.selectCountPrice = 0.00;
+				this.cartCount = 0;
+				this.isShowAuth = false;
+			};
+		},
+		methods: {
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e;
+			},
+			// 修改购物车
+			reGoCat: function() {
+				let that = this,
+					productSelect = that.productValue[this.attrValue];
+				//如果有属性,没有选择,提示用户选择
+				if (
+					that.attr.productAttr.length &&
+					productSelect === undefined
+				)
+					return that.$util.Tips({
+						title: "产品库存不足，请选择其它"
+					});
+
+				let q = {
+					id: that.cartId,
+					productId: that.product_id,
+					num: that.attr.productSelect.cart_num,
+					unique: that.attr.productSelect !== undefined ?
+						that.attr.productSelect.unique : that.productInfo.id
+				};
+				getResetCart(q)
+					.then(function(res) {
+						that.attr.cartAttr = false;
+						that.$util.Tips({
+							title: "添加购物车成功",
+							success: () => {
+								that.loadend = false;
+								that.page = 1;
+								that.cartList.valid = [];
+								that.getCartList();
+								that.getCartNum();
+							}
+						});
+					})
+					.catch(res => {
+						return that.$util.Tips({
+							title: res
+						});
+					});
+			},
+			onMyEvent: function() {
+				this.$set(this.attr, 'cartAttr', false);
+			},
+			reElection: function(item) {
+				this.getGoodsDetails(item)
+			},
+			/**
+			 * 获取产品详情
+			 * 
+			 */
+			getGoodsDetails: function(item) {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				let that = this;
+				that.cartId = item.id;
+				that.product_id = item.productId;
+				getProductDetail(item.productId).then(res => {
+					uni.hideLoading();
+					that.attr.cartAttr = true;
+					let productInfo = res.data.productInfo;
+					that.$set(that, 'productInfo', productInfo);
+					that.$set(that.attr, 'productAttr', res.data.productAttr);
+					that.$set(that, 'productValue', res.data.productValue);
+					that.DefaultSelect();
+				}).catch(err => {
+					uni.hideLoading();
+				})
+			},
+			/**
+			 * 属性变动赋值
+			 * 
+			 */
+			ChangeAttr: function(res) {
+				let productSelect = this.productValue[res];
+				if (productSelect && productSelect.stock > 0) {
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.id);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", res);
+					this.$set(this, "attrTxt", "已选择");
+				} else {
+					this.$set(this.attr.productSelect, "image", this.productInfo.image);
+					this.$set(this.attr.productSelect, "price", this.productInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", this.productInfo.id);
+					this.$set(this.attr.productSelect, "cart_num", 0);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				}
+			},
+			/**
+			 * 默认选中属性
+			 * 
+			 */
+			DefaultSelect: function() {
+				let productAttr = this.attr.productAttr;
+				let value = [];
+				for (let 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]);
+				}
+				//sort();排序函数:数字-英文-汉字；
+				let productSelect = this.productValue[value.sort().join(",")];
+				if (productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"storeName",
+						this.productInfo.storeName
+					);
+					this.$set(this.attr.productSelect, "image", productSelect.image);
+					this.$set(this.attr.productSelect, "price", productSelect.price);
+					this.$set(this.attr.productSelect, "stock", productSelect.stock);
+					this.$set(this.attr.productSelect, "unique", productSelect.id);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", value.sort().join(","));
+					this.$set(this, "attrTxt", "已选择");
+				} else if (!productSelect && productAttr.length) {
+					this.$set(
+						this.attr.productSelect,
+						"storeName",
+						this.productInfo.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.productInfo.image);
+					this.$set(this.attr.productSelect, "price", this.productInfo.price);
+					this.$set(this.attr.productSelect, "stock", 0);
+					this.$set(this.attr.productSelect, "unique", this.productInfo.id);
+					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,
+						"storeName",
+						this.productInfo.storeName
+					);
+					this.$set(this.attr.productSelect, "image", this.productInfo.image);
+					this.$set(this.attr.productSelect, "price", this.productInfo.price);
+					this.$set(this.attr.productSelect, "stock", this.productInfo.stock);
+					this.$set(
+						this.attr.productSelect,
+						"unique",
+						this.productInfo.id || ""
+					);
+					this.$set(this.attr.productSelect, "cart_num", 1);
+					this.$set(this, "attrValue", "");
+					this.$set(this, "attrTxt", "请选择");
+				}
+			},
+			attrVal(val) {
+				this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attrValues[val
+					.indexn]);
+			},
+			/**
+			 * 购物车数量加和数量减
+			 * 
+			 */
+			ChangeCartNum: function(changeValue) {
+				//changeValue:是否 加|减
+				//获取当前变动属性
+				let productSelect = this.productValue[this.attrValue];
+				//如果没有属性,赋值给商品默认库存
+				if (productSelect === undefined && !this.attr.productAttr.length)
+					productSelect = this.attr.productSelect;
+				//无属性值即库存为0；不存在加减；
+				if (productSelect === undefined) return;
+				let stock = productSelect.stock || 0;
+				let num = this.attr.productSelect;
+				if (changeValue) {
+					num.cart_num++;
+					if (num.cart_num > stock) {
+						this.$set(this.attr.productSelect, "cart_num", stock ? stock : 1);
+						this.$set(this, "cart_num", stock ? stock : 1);
+					}
+				} else {
+					num.cart_num--;
+					if (num.cart_num < 1) {
+						this.$set(this.attr.productSelect, "cart_num", 1);
+						this.$set(this, "cart_num", 1);
+					}
+				}
+			},
+			/**
+			 * 购物车手动填写
+			 * 
+			 */
+			iptCartNum: function(e) {
+				this.$set(this.attr.productSelect, 'cart_num', e);
+			},
+			subDel: function(event) {
+				let that = this,
+					selectValue = that.selectValue;
+				if (selectValue.length > 0)
+					cartDel(selectValue).then(res => {
+						that.loadend = false;
+						that.page = 1;
+						that.cartList.valid = [];
+						that.getCartList();
+						that.getCartNum();
+					});
+				else
+					return that.$util.Tips({
+						title: '请选择产品'
+					});
+			},
+			getSelectValueProductId: function() {
+				let that = this;
+				let validList = that.cartList.valid;
+				let selectValue = that.selectValue;
+				let productId = [];
+				if (selectValue.length > 0) {
+					for (let index in validList) {
+						if (that.inArray(validList[index].id, selectValue)) {
+							productId.push(validList[index].productId);
+						}
+					}
+				};
+				return productId;
+			},
+			subCollect: function(event) {
+				let that = this,
+					selectValue = that.selectValue;
+				if (selectValue.length > 0) {
+					let selectValueProductId = that.getSelectValueProductId();
+					collectAll(that.getSelectValueProductId()).then(res => {
+						return that.$util.Tips({
+							title: '收藏成功',
+							icon: 'success'
+						});
+					}).catch(err => {
+						return that.$util.Tips({
+							title: err
+						});
+					});
+				} else {
+					return that.$util.Tips({
+						title: '请选择产品'
+					});
+				}
+			},
+			// 立即下单
+			subOrder: function(event) {
+
+				let that = this,
+					selectValue = that.selectValue;
+				if (selectValue.length > 0) {
+					that.getPreOrder();
+				} else {
+					return that.$util.Tips({
+						title: '请选择产品'
+					});
+				}
+			},
+			/**
+			 * 预下单
+			 */
+			getPreOrder: function() {
+				let shoppingCartId = this.selectValue.map(item => {
+					return {
+						"shoppingCartId": Number(item)
+					}
+				})
+				this.$Order.getPreOrder("shoppingCart", shoppingCartId);
+			},
+			checkboxAllChange: function(event) {
+				let value = event.detail.value;
+				if (value.length > 0) {
+					this.setAllSelectValue(1)
+				} else {
+					this.setAllSelectValue(0)
+				}
+			},
+			setAllSelectValue: function(status) {
+				let that = this;
+				let selectValue = [];
+				let valid = that.cartList.valid;
+				if (valid.length > 0) {
+					let newValid = valid.map(item => {
+						if (status) {
+							if (that.footerswitch) {
+								if (item.attrStatus) {
+									item.checked = true;
+									selectValue.push(item.id);
+								} else {
+									item.checked = false;
+								}
+							} else {
+								item.checked = true;
+								selectValue.push(item.id);
+							}
+							that.isAllSelect = true;
+						} else {
+							item.checked = false;
+							that.isAllSelect = false;
+						}
+						return item;
+					});
+					that.$set(that.cartList, 'valid', newValid);
+					that.selectValue = selectValue;
+					that.switchSelect();
+				}
+			},
+			checkboxChange: function(event) {
+				let that = this;
+				let value = event.detail.value;
+				let valid = that.cartList.valid;
+				let arr1 = [];
+				let arr2 = [];
+				let arr3 = [];
+				let newValid = valid.map(item => {
+					if (that.inArray(item.id, value)) {
+						if (that.footerswitch) {
+							if (item.attrStatus) {
+								item.checked = true;
+								arr1.push(item);
+							} else {
+								item.checked = false;
+							}
+						} else {
+							item.checked = true;
+							arr1.push(item);
+						}
+					} else {
+						item.checked = false;
+						arr2.push(item);
+					}
+					return item;
+				});
+				if (that.footerswitch) {
+					arr3 = arr2.filter(item => !item.attrStatus);
+				}
+				that.$set(that.cartList, 'valid', newValid);
+				// let newArr = that.cartList.valid.filter(item => item.attrStatus);
+				that.isAllSelect = newValid.length === arr1.length + arr3.length;
+				that.selectValue = value;
+				that.switchSelect();
+			},
+			inArray: function(search, array) {
+				for (let i in array) {
+					if (array[i] == search) {
+						return true;
+					}
+				}
+				return false;
+			},
+			switchSelect: function() {
+				let that = this;
+				let validList = that.cartList.valid;
+				let selectValue = that.selectValue;
+				let selectCountPrice = 0.00;
+				if (selectValue.length < 1) {
+					that.selectCountPrice = selectCountPrice;
+				} else {
+					for (let index in validList) {
+						if (that.inArray(validList[index].id, selectValue)) {
+							selectCountPrice = that.$util.$h.Add(selectCountPrice, that.$util.$h.Mul(validList[index]
+								.cartNum, validList[
+									index].price))
+						}
+					}
+					that.selectCountPrice = selectCountPrice;
+				}
+			},
+			/**
+			 * 购物车手动填写
+			 * 
+			 */
+			iptCartNum: function(index) {
+				let item = this.cartList.valid[index];
+				if (item.cartNum) {
+					this.setCartNum(item.id, item.cartNum);
+				}
+				this.switchSelect();
+			},
+			blurInput: function(index) {
+				let item = this.cartList.valid[index];
+				if (!item.cartNum) {
+					item.cartNum = 1;
+					this.$set(this.cartList, 'valid', this.cartList.valid)
+				}
+			},
+			subCart: function(index) {
+				let that = this;
+				let status = false;
+				let item = that.cartList.valid[index];
+				item.cartNum = Number(item.cartNum) - 1;
+				if (item.cartNum < 1) status = true;
+				if (item.cartNum <= 1) {
+					item.cartNum = 1;
+					item.numSub = true;
+				} else {
+					item.numSub = false;
+					item.numAdd = false;
+				}
+				if (false == status) {
+					that.setCartNum(item.id, item.cartNum, function(data) {
+						that.cartList.valid[index] = item;
+						that.switchSelect();
+						that.getCartNum();
+					});
+				}
+			},
+			addCart: function(index) {
+				let that = this;
+				let item = that.cartList.valid[index];
+				item.cartNum = Number(item.cartNum) + 1;
+				let productInfo = item;
+				if (item.cartNum >= item.stock) {
+					item.cartNum = item.stock;
+					item.numAdd = true;
+					item.numSub = false;
+				} else {
+					item.numAdd = false;
+					item.numSub = false;
+				}
+				that.setCartNum(item.id, item.cartNum, function(data) {
+					that.cartList.valid[index] = item;
+					that.switchSelect();
+					that.getCartNum();
+				});
+			},
+			setCartNum(cartId, cartNum, successCallback) {
+				let that = this;
+				changeCartNum(cartId, cartNum).then(res => {
+					successCallback && successCallback(res.data);
+				});
+			},
+			getCartNum: function() {
+				let that = this;
+				getCartCounts(true, 'sum').then(res => {
+					that.cartCount = res.data.count;
+				});
+			},
+			getCartData(data) {
+				return new Promise((resolve, reject) => {
+					getCartList(data).then((res) => {
+						resolve(res.data);
+					}).catch(function(err) {
+						this.loading = false;
+						this.canShow = true;
+						this.$util.Tips({
+							title: err
+						});
+					})
+				});
+			},
+			async getCartList() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				let that = this;
+				let data = {
+					page: that.page,
+					limit: that.limit,
+					isValid: true
+				}
+				getCartCounts(true, 'sum').then(async c => {
+					that.cartCount = c.data.count;
+					if (c.data.count === 0) that.getHostProduct();
+					for (let i = 0; i < Math.ceil(that.cartCount / that.limit); i++) {
+						let cartList = await this.getCartData(data);
+						let valid = cartList.list;
+						let validList = that.$util.SplitArray(valid, that.cartList.valid);
+						let numSub = [{
+							numSub: true
+						}, {
+							numSub: false
+						}];
+						let numAdd = [{
+								numAdd: true
+							}, {
+								numAdd: false
+							}],
+							selectValue = [];
+						if (validList.length > 0) {
+							for (let index in validList) {
+								if (validList[index].cartNum == 1) {
+									validList[index].numSub = true;
+								} else {
+									validList[index].numSub = false;
+								}
+								let productInfo = validList[index];
+								let stock = validList[index].stock ? validList[index].stock : 0;
+								if (validList[index].cartNum == stock) {
+									validList[index].numAdd = true;
+								} else if (validList[index].cartNum == validList[index].stock) {
+									validList[index].numAdd = true;
+								} else {
+									validList[index].numAdd = false;
+								}
+								if (validList[index].attrStatus) {
+									validList[index].checked = true;
+									selectValue.push(validList[index].id);
+								} else {
+									validList[index].checked = false;
+								}
+							}
+						}
+						that.$set(that.cartList, 'valid', validList);
+						data.page += 1;
+						that.selectValue = selectValue;
+						let newArr = validList.filter(item => item.attrStatus);
+						that.isAllSelect = newArr.length == selectValue.length && newArr.length;
+						that.switchSelect();
+					}
+
+					that.loading = false;
+					that.canShow = true;
+					uni.hideLoading();
+				});
+			},
+			getInvalidList: function() {
+				let that = this;
+				if (this.loadendInvalid) return false;
+				if (this.loadingInvalid) return false;
+				let data = {
+					page: that.pageInvalid,
+					limit: that.limitInvalid,
+					isValid: false
+				}
+				getCartList(data).then(res => {
+					let invalid = res.data.list,
+						loadendInvalid = invalid.length < that.limitInvalid;
+					let invalidList = that.$util.SplitArray(invalid, that.cartList.invalid);
+					that.$set(that.cartList, 'invalid', invalidList);
+					that.loadendInvalid = loadendInvalid;
+					that.loadTitleInvalid = loadendInvalid ? '我也是有底线的' : '加载更多';
+					that.pageInvalid = that.pageInvalid + 1;
+					that.loadingInvalid = false;
+					//if(invalid.length===0) that.getHostProduct();
+				}).catch(res => {
+					that.loadingInvalid = false;
+					that.loadTitleInvalid = '加载更多';
+				})
+
+			},
+			getHostProduct: function() {
+				let that = this;
+				if (that.hotScroll) return
+				getProductHot(
+					that.hotPage,
+					that.hotLimit,
+				).then(res => {
+					that.hotPage++
+					that.hotScroll = res.data.list.length < that.hotLimit
+					that.hostProduct = that.hostProduct.concat(res.data.list)
+				});
+			},
+			goodsOpen: function() {
+				let that = this;
+				that.goodsHidden = !that.goodsHidden;
+			},
+			manage: function() {
+				let that = this;
+				that.footerswitch = !that.footerswitch;
+				let arr1 = [];
+				let arr2 = [];
+				let newValid = that.cartList.valid.map(item => {
+					if (that.footerswitch) {
+						if (item.attrStatus) {
+							if (item.checked) {
+								arr1.push(item.id);
+							}
+						} else {
+							item.checked = false;
+							arr2.push(item);
+						}
+					} else {
+						if (item.checked) {
+							arr1.push(item.id);
+						}
+					}
+					return item;
+				});
+				that.cartList.valid = newValid;
+				if (that.footerswitch) {
+					that.isAllSelect = newValid.length === arr1.length + arr2.length;
+				} else {
+					that.isAllSelect = newValid.length === arr1.length;
+				}
+				that.selectValue = arr1;
+				that.switchSelect();
+			},
+			unsetCart: function() {
+				let that = this,
+					ids = [];
+				for (let i = 0, len = that.cartList.invalid.length; i < len; i++) {
+					ids.push(that.cartList.invalid[i].id);
+				}
+				cartDel(ids).then(res => {
+					that.$util.Tips({
+						title: '清除成功'
+					});
+					that.$set(that.cartList, 'invalid', []);
+					that.getHostProduct();
+				}).catch(res => {
+
+				});
+			}
+		},
+		onReachBottom() {
+			let that = this;
+			if (that.loadend) {
+				that.getInvalidList();
+			}
+			if (that.cartList.valid.length == 0 && that.cartList.invalid.length == 0 && this.hotPage != 1) {
+				that.getHostProduct();
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.invalidClas {
+		position: relative;
+		z-index: 111;
+		top: -120rpx;
+	}
+
+	.invalidClasNO {
+		position: static;
+		margin-top: 15px;
+	}
+
+	.cartBox {
+		// background-color: #fff;
+	}
+
+	.shoppingCart {
+		/* #ifdef H5 */
+		// padding-bottom: 0;
+		// padding-bottom: constant(safe-area-inset-bottom);  
+		// padding-bottom: env(safe-area-inset-bottom);
+		/* #endif */
+	}
+
+	.shoppingCart .labelNav {
+		height: 178rpx;
+		padding: 30rpx 30rpx 0 30rpx;
+		font-size: 22rpx;
+		color: #fff;
+		position: fixed;
+		left: 0;
+		width: 100%;
+		box-sizing: border-box;
+		background-color: $theme-color;
+		z-index: 5;
+		top: 0;
+	}
+
+	.shoppingCart .labelNav .item .iconfont {
+		font-size: 25rpx;
+		margin-right: 10rpx;
+	}
+
+	.shoppingCart .nav {
+		width: 92%;
+		height: 90rpx;
+		background-color: #fff;
+		padding: 0 24rpx;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		font-size: 28rpx;
+		color: #282828;
+		position: fixed;
+		left: 30rpx;
+		z-index: 6;
+		top: 94rpx;
+		border-top-left-radius: 14rpx;
+		border-top-right-radius: 14rpx;
+	}
+
+	.shoppingCart .nav .num {
+		margin-left: 12rpx;
+	}
+
+	.shoppingCart .nav .administrate {
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	.shoppingCart .noCart {
+		margin-top: 171rpx;
+		background-color: #fff;
+		padding-top: 0.1rpx;
+	}
+
+	.shoppingCart .noCart .pictrue {
+		width: 414rpx;
+		height: 336rpx;
+		margin: 78rpx auto 56rpx auto;
+	}
+
+	.shoppingCart .noCart .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.shoppingCart .list {
+		width: 100%;
+		margin-top: 178rpx;
+		overflow: hidden;
+		border-bottom-left-radius: 14rpx;
+		border-bottom-right-radius: 14rpx;
+	}
+
+	.shoppingCart .list .item {
+		padding: 24rpx;
+		background-color: #fff;
+	}
+
+	.shoppingCart .list .item .picTxt {
+		width: 582rpx;
+		position: relative;
+	}
+
+	.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: 396rpx;
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.shoppingCart .list .item .picTxt .text .reColor {
+		color: #999;
+	}
+
+	.shoppingCart .list .item .picTxt .text .reElection {
+		margin-top: 20rpx;
+	}
+
+	.shoppingCart .list .item .picTxt .text .reElection .title {
+		font-size: 24rpx;
+	}
+
+	.shoppingCart .list .item .picTxt .text .reElection .reBnt {
+		width: 120rpx;
+		height: 46rpx;
+		border-radius: 23rpx;
+		font-size: 26rpx;
+	}
+
+	.shoppingCart .list .item .picTxt .text .infor {
+		font-size: 24rpx;
+		color: #999999;
+		margin-top: 16rpx;
+	}
+
+	.shoppingCart .list .item .picTxt .text .money {
+		font-size: 32rpx;
+		color: #E93323;
+		margin-top: 28rpx;
+		font-weight: 600;
+	}
+
+	.shoppingCart .list .item .picTxt .carnum {
+		height: 47rpx;
+		position: absolute;
+		bottom: 7rpx;
+		right: 0;
+	}
+
+	.shoppingCart .list .item .picTxt .carnum view {
+		border: 1rpx solid #a4a4a4;
+		width: 66rpx;
+		text-align: center;
+		height: 100%;
+		line-height: 44rpx;
+		font-size: 28rpx;
+		color: #a4a4a4;
+	}
+
+	.shoppingCart .list .item .picTxt .carnum .reduce {
+		border-right: 0;
+		border-radius: 3rpx 0 0 3rpx;
+		border-radius: 22rpx 0rpx 0rpx 22rpx;
+		font-size: 34rpx;
+		line-height: 40rpx;
+	}
+
+	.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;
+		border-radius: 0rpx 22rpx 22rpx 0rpx;
+		font-size: 34rpx;
+		line-height: 40rpx;
+	}
+
+	.shoppingCart .list .item .picTxt .carnum .num {
+		color: #282828;
+	}
+
+	.shoppingCart .invalidGoods {
+		background-color: #fff;
+		margin-top: 30rpx;
+		/* #ifdef MP */
+		margin-top: 140rpx;
+		/* #endif */
+
+	}
+
+	.shoppingCart .invalidGoods .goodsNav {
+		width: 100%;
+		height: 90rpx;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+		font-size: 28rpx;
+		color: #333333;
+	}
+
+	.shoppingCart .invalidGoods .goodsNav .iconfont {
+		color: #424242;
+		font-size: 28rpx;
+		margin-right: 17rpx;
+	}
+
+	.shoppingCart .invalidGoods .goodsNav .del {
+		font-size: 26rpx;
+		color: #333;
+	}
+
+	.shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 {
+		color: #333;
+		font-size: 33rpx;
+		vertical-align: -2rpx;
+		margin-right: 8rpx;
+	}
+
+	.shoppingCart .invalidGoods .goodsList .item {
+		padding: 24rpx;
+	}
+
+	.shoppingCart .invalidGoods .goodsList .picTxt {
+		width: 576rpx;
+	}
+
+	.shoppingCart .invalidGoods .goodsList .item .invalid {
+		font-size: 22rpx;
+		color: #CCCCCC;
+		height: 36rpx;
+		border-radius: 3rpx;
+		text-align: center;
+		line-height: 36rpx;
+	}
+
+	.shoppingCart .invalidGoods .goodsList .item .pictrue {
+		width: 160rpx;
+		height: 160rpx;
+	}
+
+	.shoppingCart .invalidGoods .goodsList .item .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.shoppingCart .invalidGoods .goodsList .item .text {
+		width: 396rpx;
+		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;
+	}
+
+	.footer {
+		z-index: 9;
+		width: 100%;
+		height: 100rpx;
+		background-color: #fff;
+		position: fixed;
+		padding: 0 24rpx;
+		box-sizing: border-box;
+		border-top: 1rpx solid #eee;
+		// border-bottom: 1px solid #EEEEEE;
+		/* #ifdef H5 */
+		bottom: 98rpx;
+		/* #endif */
+		/* #ifdef MP */
+		bottom: 0;
+		/* #endif */
+		/* #ifndef MP */
+		// bottom: 98rpx;
+		// bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		// bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		/* #endif */
+	}
+
+	.footer .checkAll {
+		font-size: 28rpx;
+		color: #282828;
+		margin-left: 14rpx;
+	}
+
+	.footer .money {
+		font-size: 30rpx;
+
+		.font-color {
+			font-weight: 600;
+		}
+	}
+
+	.footer .placeOrder {
+		color: #fff;
+		font-size: 30rpx;
+		width: 226rpx;
+		height: 70rpx;
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 70rpx;
+		margin-left: 22rpx;
+	}
+
+	.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;
+	}
+
+	.footer .button form~form {
+		margin-left: 17rpx;
+	}
+
+	.uni-p-b-96 {
+		height: 96rpx;
+	}
+</style>
diff --git a/yudao-ui-app/pages/order_addcart/order_addcart.vue b/yudao-ui-app/pages/order_addcart/order_addcart.vue
index 828105ade..0417a0c30 100644
--- a/yudao-ui-app/pages/order_addcart/order_addcart.vue
+++ b/yudao-ui-app/pages/order_addcart/order_addcart.vue
@@ -1,142 +1,72 @@
 <template>
-	<view>
-		<view class='shoppingCart copy-data'>
-			<view class='labelNav acea-row row-around'>
-				<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="borRadius14 cartBox">
-				<view
-					v-if="(cartList.valid.length === 0 && cartList.invalid.length === 0) || (cartList.valid.length > 0)"
-					class='nav acea-row row-between-wrapper'>
-					<view>购物数量 <text class='num font-color'>{{cartCount}}</text></view>
-					<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
-						class='administrate acea-row row-center-wrapper' @click='manage'>{{ footerswitch ? '管理' : '取消'}}
+	<view class="container">
+		<u-navbar title="购物车" bgColor="transparent">
+			<view class="u-nav-slot" slot="left"></view>
+			<view class="u-nav-slot" slot="right" @tap="isManager = !isManager">管理</view>
+		</u-navbar>
+		<view class="bg">
+			<image src="@/static/images/shop/cart_bg.png"></image>
+		</view>
+		<view class="box">
+			<view class="item" v-for="(item,index) in cartList.valid" :key="item.attrId">
+				<view class="item-list">
+					<view style="height: 1rpx;"></view>
+					<view class="top">
+						<text class="shopName">{{item.storeName}}</text>
 					</view>
-				</view>
-				<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" class="pad30">
-					<view class='list'>
-						<checkbox-group @change="checkboxChange">
-							<block v-for="(item,index) in cartList.valid" :key="index">
-								<view class='item acea-row row-between-wrapper'>
-									<!-- #ifndef MP -->
-									<checkbox :value="(item.id).toString()" :checked="item.checked"
-										:disabled="!item.attrStatus && footerswitch" style="margin-right: 10rpx;" />
-									<!-- #endif -->
-									<!-- #ifdef MP -->
-									<checkbox :value="item.id" :checked="item.checked"
-										:disabled="!item.attrStatus && footerswitch" />
-									<!-- #endif -->
-									<navigator :url='"/pages/goods_details/index?id="+item.productId' hover-class='none'
-										class='picTxt acea-row row-between-wrapper'>
-										<view class='pictrue'>
-											<image :src='item.image'></image>
-										</view>
-										<view class='text'>
-											<view class='line1' :class="item.attrStatus?'':'reColor'">{{item.storeName}}
-											</view>
-											<view class='infor line1' v-if="item.suk">属性：{{item.suk}}</view>
-											<view class='money' v-if="item.attrStatus">￥{{item.price}}</view>
-											<!-- <view class='money' v-if="item.attrStatus">￥{{item.truePrice}}</view> -->
-											<view class="reElection acea-row row-between-wrapper" v-else>
-												<view class="title">请重新选择商品规格</view>
-												<view class="reBnt cart-color acea-row row-center-wrapper"
-													@click.stop="reElection(item)">重选</view>
-											</view>
-										</view>
-										<view class='carnum acea-row row-center-wrapper' v-if="item.attrStatus">
-											<view class="reduce" :class="item.numSub ? 'on' : ''"
-												@click.stop='subCart(index)'>-</view>
-											<view class='num'>{{item.cartNum}}</view>
-											<view class="plus" :class="item.numAdd ? 'on' : ''"
-												@click.stop='addCart(index)'>+</view>
-										</view>
-									</navigator>
-								</view>
-							</block>
-						</checkbox-group>
-					</view>
-					<!-- cartList.valid.length===0 && cartList.invalid.length > 0 -->
-					<view v-if="cartList.invalid.length > 0" class='invalidGoods borRadius14'
-						:style="cartList.valid.length===0 && cartList.invalid.length > 0 ? 'position: relative;z-index: 111;top: -120rpx;':'position: static;'">
-						<view class='goodsNav acea-row row-between-wrapper'>
-							<view v-if="cartList.invalid.length > 1 || cartList.valid.length > 0" @click='goodsOpen'>
-								<text class='iconfont'
-									:class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>失效商品
-							</view>
-							<view v-else>
-								失效商品
-							</view>
-							<view class='del' @click='unsetCart'><text class='iconfont icon-shanchu1'></text>清空</view>
+					<view class="content">
+						<text :class="[reChecked(item)?'checkedIcon':'noCheckIcon']" @tap="reelect(item,index)"
+							style="margin-left: 26rpx;"></text>
+						<view class="image">
+							<image :src="item.image" style="border-radius: 10rpx;"></image>
 						</view>
-						<view class='goodsList' :hidden='goodsHidden'>
-							<block v-for="(item,index) in cartList.invalid" :key='index'>
-								<view class='item acea-row row-between-wrapper'>
-									<view class='invalid'>失效</view>
-									<view class='picTxt acea-row row-between-wrapper'>
-										<view class='pictrue'>
-											<image :src='item.image'></image>
-										</view>
-										<view class='text acea-row row-column-between'>
-											<view class='line1 name'>{{item.storeName}}</view>
-											<view class='infor line1' v-if="item.suk">属性：{{item.suk}}</view>
-											<view class='acea-row row-between-wrapper'>
-												<view class='end'>该商品已失效</view>
-											</view>
-										</view>
-									</view>
+						<view class="detail">
+							<view class="name">
+								{{item.storeName}}
+							</view>
+							<view class="model">
+								{{item.storeName}}
+							</view>
+							<view class="price">
+								￥{{item.price}}
+							</view>
+						</view>
+						<!-- <view class="sum">x{{item.cartNum}}</view> -->
+						<view class="numberBox">
+							<u-number-box v-model="cartNum" min="0">
+								<view @tap="ChangeCartCountJian(item.id,item.cartNum)" slot="minus" class="minus">
+									<u-icon name="minus" size="12"></u-icon>
 								</view>
-							</block>
+								<text slot="input" style="width: 50px;text-align: center;"
+									class="input">{{item.cartNum}}</text>
+								<view slot="plus" class="plus" @tap="ChangeCartCountJia(item.id,item.cartNum)">
+									<u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
+								</view>
+							</u-number-box>
 						</view>
 					</view>
-					<!-- <view class='loadingicon acea-row row-center-wrapper' v-if="cartList.valid.length&&!loadend">
-						<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-					</view> -->
-					<view class='loadingicon acea-row row-center-wrapper' v-if="cartList.invalid.length&&loadend">
-						<text class='loading iconfont icon-jiazai'
-							:hidden='loadingInvalid==false'></text>{{loadTitleInvalid}}
-					</view>
-				</view>
-				<view class='noCart' v-if="cartList.valid.length == 0 && cartList.invalid.length == 0 && canShow">
-					<view class='pictrue'>
-						<image src='../../static/images/noCart.png'></image>
-					</view>
-					<recommend :hostProduct='hostProduct'></recommend>
-				</view>
-			</view>
-		</view>
-		<view class='footer acea-row row-between-wrapper' v-if="cartList.valid.length > 0">
-			<view>
-				<checkbox-group @change="checkboxAllChange">
-					<checkbox value="all" :checked="!!isAllSelect" />
-					<text class='checkAll'>全选({{selectValue.length}})</text>
-				</checkbox-group>
-			</view>
-			<view class='money acea-row row-middle' v-if="footerswitch==true">
-				<text class='font-color'>￥{{selectCountPrice}}</text>
-				<form @submit="subOrder" report-submit='true'>
-					<button class='placeOrder bg-color' formType="submit">立即下单</button>
-				</form>
-			</view>
-			<view class='button acea-row row-middle' v-else>
-				<form @submit="subCollect" report-submit='true'>
-					<button class='bnt cart-color' formType="submit">收藏</button>
-				</form>
-				<form @submit="subDel" report-submit='true'>
-					<button class='bnt' formType="submit">删除</button>
-				</form>
-			</view>
-		</view>
-		<productWindow :attr="attr" :isShow='1' :iSplus='1' :iScart='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
-			@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" @goCat="reGoCat"
-			id='product-window'></productWindow>
-		<view class="uni-p-b-96"></view>
-		<view class="uni-p-b-98"></view>
-		<!-- #ifdef MP -->
-		<!-- <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
 
+				</view>
+
+			</view>
+
+		</view>
+		<view class="fixed" v-if="isManager">
+			<view class="all" @tap="allCheck">
+				<text :class="[isAllSelect?'checkedIcon':'noCheckIcon']"></text>
+				<text>全选</text>
+			</view>
+			<view class="allPrice">合计 <text>￥998.00</text> </view>
+			<view class="closeAll" @tap="subOrder">结算()</view>
+		</view>
+		<view class="fixed" v-if="!isManager">
+			<view class="all" @tap="allCheck">
+				<text :class="[isAllSelect?'checkedIcon':'noCheckIcon']"></text>
+				<text>全选</text>
+			</view>
+			<view class="collect">收藏</view>
+			<view class="delAll" @tap="subDel">删除</view>
+		</view>
 	</view>
 </template>
 
@@ -149,6 +79,7 @@
 		cartDel,
 		getResetCart
 	} from '@/api/order.js';
+	import Vue from 'vue'
 	import {
 		getProductHot,
 		collectAll,
@@ -164,6 +95,9 @@
 	import productWindow from '@/components/productWindow';
 	// #ifdef MP
 	import authorize from '@/components/Authorize';
+	import {
+		login
+	} from '../../api/public';
 	// #endif
 	export default {
 		components: {
@@ -183,6 +117,8 @@
 					valid: [],
 					invalid: []
 				},
+				cartNum: 0,
+				isManager: true,
 				isAllSelect: false, //全选
 				selectValue: [], //选中的数据
 				selectCountPrice: 0.00,
@@ -190,6 +126,35 @@
 				isShowAuth: false, //是否隐藏授权
 				hotScroll: false,
 				hotPage: 1,
+				value: '',
+				radiolist1: [{
+					name: '全选',
+					disabled: false
+				}],
+				checkboxValue1: [],
+				// 基本案列数据
+				checkboxList1: [{
+					firmId: 101,
+					firmName: '商铺名称',
+					selectedAll: false,
+					goods: [{
+						id: 1,
+						img: '@/static/images/shop/shoes.png',
+						name: '商品标题1',
+						spec: '规格:S码',
+						price: 127.5,
+						number: 1,
+						selected: false
+					}, {
+						id: 2,
+						img: '@/static/images/shop/shoes.png',
+						name: '标商品标题商品标题商品标',
+						spec: '规格:S码',
+						price: 2.5,
+						number: 2,
+						selected: false
+					}]
+				}, ],
 				hotLimit: 10,
 				loading: false,
 				loadend: false,
@@ -216,9 +181,36 @@
 				canShow: false
 			};
 		},
-		computed: mapGetters(['isLogin']),
+		computed: {
+			...mapGetters(['isLogin']),
+			reChecked() {
+				return item => {
+					return item.checked
+				}
+			},
+			allSelectval() {
+				let count = 0
+				this.cartList.forEach(item => {
+					if (item.checked) {
+						count += 1
+					}
+				})
+				if(count == this.cartList.length){
+					return true
+				}else {
+					return false
+				}
+			}
+		},
 		onLoad: function(options) {
 			let that = this;
+			console.log(that.isAllSelect, 'isAllselect')
+			that.cartList.valid.forEach((item, index) => {
+				if (!item.checked) {
+					that.isAllSelect = false
+					return
+				}
+			})
 			if (that.isLogin == false) {
 				toLogin();
 			}
@@ -254,6 +246,59 @@
 			};
 		},
 		methods: {
+			// 全选
+			allCheck() {
+				this.isAllSelect = !this.isAllSelect
+				if (this.isAllSelect) {
+					this.cartList.valid.forEach((item, index) => {
+						item.checked = true
+						Vue.set(this.cartList.valid, index, item)
+						Vue.set(this.cartList, 'valid', this.cartList.valid)
+					})
+				} else {
+					this.cartList.valid.forEach((item, index) => {
+						item.checked = false
+						Vue.set(this.cartList.valid, index, item)
+						Vue.set(this.cartList, 'valid', this.cartList.valid)
+					})
+				}
+			},
+			// 购物车重选
+			reelect(item, index) {
+				console.log(item,'item哇')
+				// let reCheck = {
+				// 	id: item.id,
+				// 	num: item.cartNum+2,
+				// 	productId: item.productId,
+				// 	unique: item.productAttrUnique
+				// }
+				// getResetCart(reCheck).then(res=> {
+				// 	console.log('重选成功')
+				// })
+				item.checked = !item.checked
+				Vue.set(this.cartList.valid, index, item)
+				Vue.set(this.cartList, 'valid', this.cartList.valid)
+
+			},
+			//购物车商品数量增加
+			ChangeCartCountJia(id, num) {
+				let count = num + 1
+				changeCartNum(id, count).then(res => {
+					console.log('++成功')
+					this.cartList.valid = []
+					this.getCartList()
+				})
+
+			},
+			// 购物车商品数量减少
+			ChangeCartCountJian(id, num) {
+				let count = num - 1
+				changeCartNum(id, count).then(res => {
+					console.log('-成功')
+					this.cartList.valid = []
+					this.getCartList()
+				})
+			},
 			// 授权关闭
 			authColse: function(e) {
 				this.isShowAuth = e;
@@ -456,8 +501,15 @@
 				this.$set(this.attr.productSelect, 'cart_num', e);
 			},
 			subDel: function(event) {
-				let that = this,
-					selectValue = that.selectValue;
+				let selectValue = []
+				this.cartList.valid.forEach(item => {
+					if (item.checked && (selectValue.indexOf(item.id) < 0)) {
+						selectValue.push(item.id)
+					}
+				})
+				console.log(selectValue,'000000')
+				this.selectValue = selectValue
+				let that = this
 				if (selectValue.length > 0)
 					cartDel(selectValue).then(res => {
 						that.loadend = false;
@@ -486,7 +538,7 @@
 				return productId;
 			},
 			subCollect: function(event) {
-				let that = this,
+				let that = this
 					selectValue = that.selectValue;
 				if (selectValue.length > 0) {
 					let selectValueProductId = that.getSelectValueProductId();
@@ -508,9 +560,16 @@
 			},
 			// 立即下单
 			subOrder: function(event) {
+				let selectValue = []
+				this.cartList.valid.forEach(item => {
+					console.log(item, 99999999)
+					if (item.checked && (selectValue.indexOf(item.id) < 0)) {
+						selectValue.push(item.id)
+					}
 
-				let that = this,
-					selectValue = that.selectValue;
+				})
+				this.selectValue = selectValue
+				let that = this
 				if (selectValue.length > 0) {
 					that.getPreOrder();
 				} else {
@@ -728,6 +787,7 @@
 					if (c.data.count === 0) that.getHostProduct();
 					for (let i = 0; i < Math.ceil(that.cartCount / that.limit); i++) {
 						let cartList = await this.getCartData(data);
+						console.log(cartList, 'cartlist');
 						let valid = cartList.list;
 						let validList = that.$util.SplitArray(valid, that.cartList.valid);
 						let numSub = [{
@@ -768,6 +828,7 @@
 						that.$set(that.cartList, 'valid', validList);
 						data.page += 1;
 						that.selectValue = selectValue;
+						console.log(that.cartList)
 						let newArr = validList.filter(item => item.attrStatus);
 						that.isAllSelect = newArr.length == selectValue.length && newArr.length;
 						that.switchSelect();
@@ -792,6 +853,7 @@
 						loadendInvalid = invalid.length < that.limitInvalid;
 					let invalidList = that.$util.SplitArray(invalid, that.cartList.invalid);
 					that.$set(that.cartList, 'invalid', invalidList);
+					console.log(that.cartList, 'sssss')
 					that.loadendInvalid = loadendInvalid;
 					that.loadTitleInvalid = loadendInvalid ? '我也是有底线的' : '加载更多';
 					that.pageInvalid = that.pageInvalid + 1;
@@ -842,6 +904,7 @@
 					return item;
 				});
 				that.cartList.valid = newValid;
+				console.log(that.cartList.valid, 'that.cartList.valid')
 				if (that.footerswitch) {
 					that.isAllSelect = newValid.length === arr1.length + arr2.length;
 				} else {
@@ -880,348 +943,292 @@
 </script>
 
 <style scoped lang="scss">
-	.invalidClas {
+	.container {
 		position: relative;
-		z-index: 111;
-		top: -120rpx;
-	}
-
-	.invalidClasNO {
-		position: static;
-		margin-top: 15px;
-	}
-
-	.cartBox {
-		// background-color: #fff;
-	}
-
-	.shoppingCart {
-		/* #ifdef H5 */
-		// padding-bottom: 0;
-		// padding-bottom: constant(safe-area-inset-bottom);  
-		// padding-bottom: env(safe-area-inset-bottom);
-		/* #endif */
-	}
-
-	.shoppingCart .labelNav {
-		height: 178rpx;
-		padding: 30rpx 30rpx 0 30rpx;
-		font-size: 22rpx;
-		color: #fff;
-		position: fixed;
-		left: 0;
 		width: 100%;
-		box-sizing: border-box;
-		background-color: $theme-color;
-		z-index: 5;
-		top: 0;
-	}
+		height: calc(100vh - 50px);
+		// overflow: hidden;
 
-	.shoppingCart .labelNav .item .iconfont {
-		font-size: 25rpx;
-		margin-right: 10rpx;
-	}
+		.bg {
+			width: 100%;
+			height: 100%;
+			z-index: 0;
 
-	.shoppingCart .nav {
-		width: 92%;
-		height: 90rpx;
-		background-color: #fff;
-		padding: 0 24rpx;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		color: #282828;
-		position: fixed;
-		left: 30rpx;
-		z-index: 6;
-		top: 94rpx;
-		border-top-left-radius: 14rpx;
-		border-top-right-radius: 14rpx;
-	}
-
-	.shoppingCart .nav .num {
-		margin-left: 12rpx;
-	}
-
-	.shoppingCart .nav .administrate {
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	.shoppingCart .noCart {
-		margin-top: 171rpx;
-		background-color: #fff;
-		padding-top: 0.1rpx;
-	}
-
-	.shoppingCart .noCart .pictrue {
-		width: 414rpx;
-		height: 336rpx;
-		margin: 78rpx auto 56rpx auto;
-	}
-
-	.shoppingCart .noCart .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.shoppingCart .list {
-		width: 100%;
-		margin-top: 178rpx;
-		overflow: hidden;
-		border-bottom-left-radius: 14rpx;
-		border-bottom-right-radius: 14rpx;
-	}
-
-	.shoppingCart .list .item {
-		padding: 24rpx;
-		background-color: #fff;
-	}
-
-	.shoppingCart .list .item .picTxt {
-		width: 582rpx;
-		position: relative;
-	}
-
-	.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: 396rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reColor {
-		color: #999;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reElection {
-		margin-top: 20rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reElection .title {
-		font-size: 24rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .reElection .reBnt {
-		width: 120rpx;
-		height: 46rpx;
-		border-radius: 23rpx;
-		font-size: 26rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .infor {
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 16rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .text .money {
-		font-size: 32rpx;
-		color: #E93323;
-		margin-top: 28rpx;
-		font-weight: 600;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum {
-		height: 47rpx;
-		position: absolute;
-		bottom: 7rpx;
-		right: 0;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum view {
-		border: 1rpx solid #a4a4a4;
-		width: 66rpx;
-		text-align: center;
-		height: 100%;
-		line-height: 44rpx;
-		font-size: 28rpx;
-		color: #a4a4a4;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .reduce {
-		border-right: 0;
-		border-radius: 3rpx 0 0 3rpx;
-		border-radius: 22rpx 0rpx 0rpx 22rpx;
-		font-size: 34rpx;
-		line-height: 40rpx;
-	}
-
-	.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;
-		border-radius: 0rpx 22rpx 22rpx 0rpx;
-		font-size: 34rpx;
-		line-height: 40rpx;
-	}
-
-	.shoppingCart .list .item .picTxt .carnum .num {
-		color: #282828;
-	}
-
-	.shoppingCart .invalidGoods {
-		background-color: #fff;
-		margin-top: 30rpx;
-		/* #ifdef MP */
-		margin-top: 140rpx;
-		/* #endif */
-
-	}
-
-	.shoppingCart .invalidGoods .goodsNav {
-		width: 100%;
-		height: 90rpx;
-		padding: 0 24rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		color: #333333;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .iconfont {
-		color: #424242;
-		font-size: 28rpx;
-		margin-right: 17rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .del {
-		font-size: 26rpx;
-		color: #333;
-	}
-
-	.shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 {
-		color: #333;
-		font-size: 33rpx;
-		vertical-align: -2rpx;
-		margin-right: 8rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item {
-		padding: 24rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .picTxt {
-		width: 576rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .invalid {
-		font-size: 22rpx;
-		color: #CCCCCC;
-		height: 36rpx;
-		border-radius: 3rpx;
-		text-align: center;
-		line-height: 36rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .pictrue {
-		width: 160rpx;
-		height: 160rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.shoppingCart .invalidGoods .goodsList .item .text {
-		width: 396rpx;
-		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;
-	}
-
-	.footer {
-		z-index: 9;
-		width: 100%;
-		height: 100rpx;
-		background-color: #fff;
-		position: fixed;
-		padding: 0 24rpx;
-		box-sizing: border-box;
-		border-top: 1rpx solid #eee;
-		// border-bottom: 1px solid #EEEEEE;
-		/* #ifdef H5 */
-		bottom: 98rpx;
-		/* #endif */
-		/* #ifdef MP */
-		bottom: 0;
-		/* #endif */
-		/* #ifndef MP */
-		// bottom: 98rpx;
-		// bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		// bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		/* #endif */
-	}
-
-	.footer .checkAll {
-		font-size: 28rpx;
-		color: #282828;
-		margin-left: 14rpx;
-	}
-
-	.footer .money {
-		font-size: 30rpx;
-
-		.font-color {
-			font-weight: 600;
+			image {
+				width: 100%;
+				height: 100%;
+				// overflow: hidden;
+				object-fit: cover;
+			}
 		}
-	}
 
-	.footer .placeOrder {
-		color: #fff;
-		font-size: 30rpx;
-		width: 226rpx;
-		height: 70rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 70rpx;
-		margin-left: 22rpx;
-	}
+		.box {
+			position: absolute;
+			top: 167rpx;
+			width: 100%;
+			height: 1000rpx;
+			overflow: scroll;
 
-	.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;
-	}
+			.item {
+				margin-top: 20rpx;
+				margin-left: 40rpx;
+				width: 669rpx;
+				background: #fff;
+				border-radius: 20rpx;
+				z-index: 1;
 
-	.footer .button form~form {
-		margin-left: 17rpx;
-	}
+				.checkedIcon {
+					display: inline-block;
+					width: 34rpx;
+					height: 34rpx;
+					background: url(@/static/images/shop/checked.png);
+					background-size: 100% 100%;
+				}
+
+				.noCheckIcon {
+					display: inline-block;
+					width: 34rpx;
+					height: 34rpx;
+					background: url(@/static/images/shop/nochecked.png);
+					background-size: 100% 100%;
+				}
+
+				.top {
+					margin-left: 25rpx;
+					margin-top: 19rpx;
+					display: flex;
+					align-items: center;
+
+					.shopName {
+						display: inline-block;
+						width: 240rpx;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						overflow: hidden;
+						height: 40rpx;
+						line-height: 28rpx;
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
+				}
+
+				.content {
+					position: relative;
+					margin-top: 10rpx;
+					width: 100%;
+					height: 150rpx;
+					display: flex;
+					align-items: center;
+
+					image {
+						margin-left: 34rpx;
+						width: 111rpx;
+						height: 98rpx;
+						border-radius: 20rpx;
+					}
+
+					.detail {
+						margin-top: -10rpx;
+						margin-left: 25rpx;
+
+						.name {
+							width: 400rpx;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							overflow: hidden;
+							font-size: 26rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #000000;
+						}
+
+						.model {
+							width: 300rpx;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							overflow: hidden;
+							margin: 10rpx 0;
+							font-size: 24rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #B7B7B7;
+						}
+
+						.price {
+							font-size: 26rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #E94343;
+						}
+					}
+
+					.sum {
+						position: absolute;
+						bottom: 29rpx;
+						right: 32rpx;
+						width: 50rpx;
+						height: 50rpx;
+						line-height: 50rpx;
+						text-align: center;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #FD491F;
+						border: 1px solid #FD491F;
+						border-radius: 10rpx;
+					}
+
+					.numberBox {
+						position: absolute;
+						bottom: 16rpx;
+						right: 30rpx;
+
+						.minus {
+							width: 44rpx;
+							height: 44rpx;
+							border-width: 1px;
+							border-color: #E6E6E6;
+							border-style: solid;
+							border-top-left-radius: 200rpx;
+							border-top-right-radius: 200rpx;
+							border-bottom-left-radius: 200rpx;
+							border-bottom-right-radius: 200rpx;
+							@include flex;
+							justify-content: center;
+							align-items: center;
+						}
+
+						.input {
+							width: 50rpx !important;
+							padding: 0 10rpx;
+						}
+
+						.plus {
+							width: 44rpx;
+							height: 44rpx;
+							background-color: #FF0000;
+							border-radius: 50%;
+							/* #ifndef APP-NVUE */
+							display: flex;
+							/* #endif */
+							justify-content: center;
+							align-items: center;
+						}
+					}
+				}
+
+			}
+
+		}
+
+		.fixed {
+			position: absolute;
+			bottom: 10rpx;
+			width: 100%;
+			height: 110rpx;
+			background: #fff;
+
+			.all {
+				position: absolute;
+				top: 35rpx;
+				left: 42rpx;
+				display: flex;
+				align-items: center;
+				font-size: 35rpx;
+
+				.checkedIcon {
+					display: inline-block;
+					width: 34rpx;
+					height: 34rpx;
+					background: url(@/static/images/shop/checked.png);
+					background-size: 100% 100%;
+				}
+
+				.noCheckIcon {
+					display: inline-block;
+					width: 34rpx;
+					height: 34rpx;
+					background: url(@/static/images/shop/nochecked.png);
+					background-size: 100% 100%;
+				}
+
+				text {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					margin-right: 10rpx;
+					color: #000000;
+				}
+			}
+
+			.allPrice {
+				position: absolute;
+				right: 222rpx;
+				top: 34rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #000000;
+
+				text {
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #E94343;
+				}
+			}
+
+			.collect {
+				position: absolute;
+				right: 209rpx;
+				top: 23rpx;
+				width: 155rpx;
+				height: 57rpx;
+				line-height: 57rpx;
+				text-align: center;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #EF2461;
+				background: #FFF1F5;
+				border: 1px solid #EF2462;
+				border-radius: 28rpx;
+			}
+
+			.closeAll {
+				position: absolute;
+				right: 20rpx;
+				top: 23rpx;
+				text-align: center;
+				width: 170rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				background: linear-gradient(0deg, #EE1C5D 0%, #FF6486 100%);
+				border-radius: 28rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+
+			.delAll {
+				position: absolute;
+				right: 20rpx;
+				top: 23rpx;
+				text-align: center;
+				width: 170rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				background: linear-gradient(0deg, #FC0607 0%, #FF1C1C 100%);
+				border-radius: 28rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+		}
 
-	.uni-p-b-96 {
-		height: 96rpx;
 	}
 </style>
diff --git a/yudao-ui-app/pages/order_details/index - 副本.vue b/yudao-ui-app/pages/order_details/index - 副本.vue
new file mode 100644
index 000000000..caa89d011
--- /dev/null
+++ b/yudao-ui-app/pages/order_details/index - 副本.vue	
@@ -0,0 +1,1035 @@
+<template>
+	<view>
+		<view class='order-details'>
+			<!-- 给header上与data上加on为退款订单-->
+			<view class='header bg-color' :class='isGoodsReturn ? "on":""'>
+				<view class='picTxt acea-row row-middle'>
+					<view class='pictrue' v-if="isGoodsReturn==false">
+						<image :src="orderInfo.statusPic"></image>
+					</view>
+					<view class='data' :class='isGoodsReturn ? "on":""'>
+						<view class='state'>{{orderInfo.orderStatusMsg}}</view>
+						<view>{{orderInfo.createTime}}</view>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="isGoodsReturn==false" class="pad30">
+				<view class='nav'>
+					<view class='navCon acea-row row-between-wrapper'>
+						<view :class="!orderInfo.paid ? 'on':''">待付款</view>
+						<view :class="orderInfo.paid && orderInfo.status == 0 ? 'on':''">
+							{{orderInfo.shippingType==1 ? '待发货':'待核销'}}</view>
+						<view :class="orderInfo.status == 1 ? 'on':''" v-if="orderInfo.shippingType == 1">待收货</view>
+						<view :class="orderInfo.status == 2 ? 'on':''">待评价</view>
+						<view :class="orderInfo.status == 3 ? 'on':''">已完成</view>
+					</view>
+					<view class='progress acea-row row-between-wrapper'>
+						<view class='iconfont'
+							:class='(!orderInfo.paid ? "icon-webicon318":"icon-yuandianxiao") + " " + ( orderInfo.paid ? "font-color":"")'>
+						</view>
+						<view class='line' :class='orderInfo.paid > 0 ? "bg-color":""'></view>
+						<view class='iconfont'
+							:class='(orderInfo.status == 0 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "font-color":"")'>
+						</view>
+						<view class='line' :class='orderInfo.status > 0 ? "bg-color":""'
+							v-if="orderInfo.shippingType == 1"></view>
+						<view class='iconfont'
+							:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 ? "font-color":"")'
+							v-if="orderInfo.shippingType == 1"></view>
+						<view class='line' :class='orderInfo.status > 1 ? "bg-color":""'></view>
+						<view class='iconfont'
+							:class='(orderInfo.status == 2 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 ? "font-color":"")'>
+						</view>
+						<view class='line' :class='orderInfo.status > 2 ? "bg-color":""'></view>
+						<view class='iconfont'
+							:class='(orderInfo.status == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 3 ? "font-color":"")'>
+						</view>
+					</view>
+				</view>
+				<view v-if="orderInfo.shippingType == 2 && orderInfo.paid" class="writeOff borRadius14">
+					<view class="title">核销信息</view>
+					<view class="grayBg">
+						<view class="pictrue">
+							<!-- <div class="qrcode" ref="qrcode"></div> -->
+							<!-- <canvas canvas-id="qrcode" :style="{width: `${qrcodeSize}100%`, height: `${qrcodeSize}100%`}"/> -->
+							<image :src="codeImg"></image>
+						</view>
+					</view>
+					<view class="gear">
+						<image src="../../static/images/writeOff.jpg"></image>
+					</view>
+					<view class="num">{{orderInfo.verifyCode}}</view>
+					<view class="rules" v-if='orderInfo.systemStore'>
+						<view class="item">
+							<view class="rulesTitle acea-row row-middle">
+								<text class="iconfont icon-shijian"></text>核销时间
+							</view>
+							<view class="info">
+								每日：<text class="time">{{orderInfo.systemStore.dayTime.replace(',','-')}}</text>
+							</view>
+						</view>
+						<view class="item">
+							<view class="rulesTitle acea-row row-middle">
+								<text class="iconfont icon-shuoming1"></text>使用说明
+							</view>
+							<view class="info">可将二维码出示给店员扫描或提供数字核销码</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="orderInfo.shippingType == 2" class="map acea-row row-between-wrapper borRadius14">
+					<view>自提地址信息</view>
+					<view class="place cart-color acea-row row-center-wrapper" @tap="showMaoLocation">
+						<text class="iconfont icon-weizhi"></text>查看位置
+					</view>
+				</view>
+				<view v-if="orderInfo.shippingType === 1" class='address borRadius14'>
+					<view class='name'>{{orderInfo.realName}}<text class='phone'>{{orderInfo.userPhone}}</text></view>
+					<view>{{orderInfo.userAddress}}</view>
+				</view>
+				<view v-else class='address' style="margin-top:15rpx;">
+					<view class='name' @tap="makePhone">{{orderInfo.systemStore?orderInfo.systemStore.name:''}}<text
+							class='phone'>{{orderInfo.systemStore?orderInfo.systemStore.phone:''}}</text><text
+							class="iconfont icon-tonghua font-color"></text></view>
+					<view>{{orderInfo.systemStore?orderInfo.systemStore.detailedAddress:''}}</view>
+				</view>
+
+				<orderGoods :evaluate='evaluate' :productType="orderInfo.type" :orderId="order_id" :ids="id" :uniId="uniId" :cartInfo="cartInfo"
+					:jump="true"></orderGoods>
+				<!-- #ifndef MP -->
+				<div class="goodCall borRadius14" @click="kefuClick">
+					<span class="iconfont icon-kefu"></span><span>联系客服</span>
+				</div>
+				<!-- #endif -->
+				<!-- #ifdef MP -->
+				<div class="goodCall borRadius14">
+					<button open-type='contact' hover-class='none'>
+						<span class="iconfont icon-kefu"></span><span>联系客服</span>
+					</button>
+				</div>
+				<!-- #endif -->
+			</view>
+
+			<view class="pad30">
+				<view class='nav refund' v-if="orderInfo.refundStatus>0">
+					<view class="title">
+						<image src="/static/images/shuoming.png" mode=""></image>
+						{{orderInfo.refundStatus==1?'商家审核中':orderInfo.refundStatus==2?'商家已退款':'商家拒绝退款'}}
+					</view>
+					<view class="con pad30">{{orderInfo.refundStatus==1 ? "您已成功发起退款申请，请耐心等待商家处理；退款前请与商家协商一致，有助于更好的处理售后问题": orderInfo.refundStatus==2? "退款已成功受理，如商家已寄出商品请尽快退回；感谢您的支持": "拒绝原因：" + orderInfo.refundReason}}</view>
+				</view>
+				<view class='wrapper borRadius14'>
+					<view class='item acea-row row-between'>
+						<view>订单编号：</view>
+						<view class='conter acea-row row-middle row-right'>{{orderInfo.orderId}}
+							<!-- #ifndef H5 -->
+							<text class='copy' @tap='copy'>复制</text>
+							<!-- #endif -->
+							<!-- #ifdef H5 -->
+							<text class='copy copy-data' :data-clipboard-text="orderInfo.orderId">复制</text>
+							<!-- #endif -->
+						</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>下单时间：</view>
+						<view class='conter'>{{(orderInfo.createTime || 0)}}</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>支付状态：</view>
+						<view class='conter' v-if="orderInfo.paid">已支付</view>
+						<view class='conter' v-else>未支付</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>支付方式：</view>
+						<view class='conter'>{{orderInfo.payTypeStr}}</view>
+					</view>
+					<view class='item acea-row row-between' v-if="orderInfo.mark">
+						<view>买家留言：</view>
+						<view class='conter'>{{orderInfo.mark}}</view>
+					</view>
+				</view>
+				<!-- 退款订单详情 "-->
+				<view v-if="isGoodsReturn" class='wrapper borRadius14' >
+					<view class='item acea-row row-between'>
+						<view>收货人：</view>
+						<view class='conter'>{{orderInfo.realName}}</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>联系电话：</view>
+						<view class='conter'>{{orderInfo.userPhone}}</view>
+					</view>
+					<view class='item acea-row row-between'>
+						<view>收货地址：</view>
+						<view class='conter'>{{orderInfo.userAddress}}</view>
+					</view>
+				</view>
+				<view v-if="orderInfo.status>0">
+					<view class='wrapper borRadius14' v-if='orderInfo.deliveryType=="express"'>
+						<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.deliveryName || ''}}</view>
+						</view>
+						<view class='item acea-row row-between'>
+							<view>快递号：</view>
+							<view class='conter'>{{orderInfo.deliveryId || ''}}</view>
+						</view>
+					</view>
+					<view class='wrapper borRadius14' v-else-if='orderInfo.deliveryType=="send"'>
+						<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.deliveryName || ''}}</view>
+						</view>
+						<view class='item acea-row row-between'>
+							<view>联系电话：</view>
+							<view class='conter acea-row row-middle row-right'>{{orderInfo.deliveryId || ''}}<text
+									class='copy' @tap='goTel'>拨打</text></view>
+						</view>
+					</view>
+					<view class='wrapper borRadius14' v-else-if='orderInfo.deliveryType=="fictitious"'>
+						<view class='item acea-row row-between'>
+							<view>虚拟发货：</view>
+							<view class='conter'>已发货，请注意查收</view>
+						</view>
+					</view>
+				</view>
+				<view class='wrapper borRadius14'>
+					<view class='item acea-row row-between'>
+						<view>商品总价：</view>
+						<view class='conter'>￥{{orderInfo.proTotalPrice}}</view>
+					</view>
+					<view class='item acea-row row-between' v-if="orderInfo.payPostage > 0">
+						<view>运费：</view>
+						<view class='conter'>￥{{orderInfo.payPostage}}</view>
+					</view>
+					<view class='item acea-row row-between' v-if='orderInfo.couponId'>
+						<view>优惠券抵扣：</view>
+						<view class='conter'>-￥{{orderInfo.couponPrice}}</view>
+					</view>
+					<view class='item acea-row row-between' v-if="orderInfo.useIntegral > 0">
+						<view>积分抵扣：</view>
+							<view class='conter'>-￥{{orderInfo.deductionPrice}}</view>
+					</view>
+					<view class='actualPay acea-row row-right'>实付款：<text
+							class='money font-color'>￥{{orderInfo.payPrice}}</text></view>
+				</view>
+				<view style='height:120rpx;'></view>
+				<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
+					<view class="qs-btn" v-if="!orderInfo.paid" @click.stop="cancelOrder">取消订单</view>
+					<view class='bnt bg-color' v-if="!orderInfo.paid" @tap='pay_open(orderInfo.orderId)'>立即付款</view>
+					<!-- #ifdef MP -->
+					<view @tap="openSubcribe('/pages/users/goods_return/index?orderId='+orderInfo.orderId)"
+						class='bnt cancel' v-else-if="orderInfo.paid === true && orderInfo.refundStatus === 0 && orderInfo.type!==1 && type==='normal'">申请退款
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef MP -->
+					<navigator hover-class="none" :url="'/pages/users/goods_return/index?orderId='+orderInfo.orderId"
+						class='bnt cancel' v-else-if="orderInfo.paid === true && orderInfo.refundStatus === 0 && orderInfo.type!==1 && type==='normal'">申请退款
+					</navigator>
+					<!-- #endif -->
+					<view class='bnt bg-color' v-if="orderInfo.combinationId > 0" @tap='goJoinPink'>查看拼团</view>
+					<navigator class='bnt cancel' v-if="orderInfo.deliveryType == 'express' && orderInfo.status >0"
+						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.orderId">查看物流
+					</navigator>
+					<view class='bnt bg-color' v-if="orderInfo.status==1" @tap='confirmOrder'>确认收货</view>
+					<view class='bnt cancel' v-if="orderInfo.status==3" @tap='delOrder'>删除订单</view>
+					<view class='bnt bg-color' v-if="orderInfo.status==3 && orderInfo.type!==1" @tap='goOrderConfirm'>再次购买</view>
+				</view>
+			</view>
+
+
+		</view>
+		<home></home>
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+			:totalPrice='totalPrice'></payment>
+	</view>
+</template>
+<style scoped lang="scss">
+	.shuoming{
+		width: 32rpx;
+		height: 32rpx;
+	}
+	.goodCall {
+		color: $theme-color;
+		text-align: center;
+		width: 100%;
+		height: 86rpx;
+		padding: 0 30rpx;
+		border-bottom: 1rpx solid #eee;
+		font-size: 30rpx;
+		line-height: 86rpx;
+		background: #fff;
+
+		.icon-kefu {
+			font-size: 36rpx;
+			margin-right: 15rpx;
+		}
+
+		/* #ifdef MP */
+		button {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 86rpx;
+			font-size: 30rpx;
+			color: $theme-color;
+		}
+
+		/* #endif */
+	}
+
+	.order-details .header {
+		height: 250rpx;
+		padding: 0 30rpx;
+	}
+
+	.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;
+	}
+
+	.order-details .header .data .time {
+		margin-left: 20rpx;
+	}
+
+	.picTxt {
+		height: 150rpx;
+	}
+
+	.order-details .nav {
+		background-color: #fff;
+		font-size: 26rpx;
+		color: #282828;
+		padding: 27rpx 0;
+		width: 100%;
+		border-radius: 14rpx;
+		margin: -100rpx auto 0 auto;
+	}
+
+	.order-details .nav .navCon {
+		padding: 0 40rpx;
+	}
+
+	.order-details .nav .on {
+		color: $theme-color;
+	}
+
+	.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: 15rpx;
+		padding: 30rpx 24rpx;
+	}
+
+	.order-details .address .name {
+		font-size: 30rpx;
+		color: #282828;
+		margin-bottom: 15rpx;
+	}
+
+	.order-details .address .name .phone {
+		margin-left: 40rpx;
+	}
+
+	.order-details .line {
+		width: 100%;
+		height: 3rpx;
+	}
+
+	.order-details .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-details .wrapper {
+		background-color: #fff;
+		margin-top: 12rpx;
+		padding: 30rpx 24rpx;
+	}
+
+	.order-details .wrapper .item {
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.order-details .wrapper .item~.item {
+		margin-top: 20rpx;
+	}
+
+	.order-details .wrapper .item .conter {
+		color: #868686;
+		// width: 490rpx;
+		text-align: right;
+	}
+
+	.order-details .wrapper .item .conter .copy {
+		font-size: 20rpx;
+		color: #333;
+		border-radius: 20rpx;
+		border: 1rpx solid #666;
+		padding: 3rpx 15rpx;
+		margin-left: 24rpx;
+	}
+
+	.order-details .wrapper .actualPay {
+		border-top: 1rpx solid #eee;
+		margin-top: 30rpx;
+		padding-top: 30rpx;
+	}
+
+	.order-details .wrapper .actualPay .money {
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+
+	.order-details .footer {
+		width: 100%;
+		height: 100rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+	}
+
+	.order-details .footer .bnt {
+		width: 158rpx;
+		height: 54rpx;
+		text-align: center;
+		line-height: 54rpx;
+		border-radius: 50rpx;
+		color: #fff;
+		font-size: 27rpx;
+	}
+
+	.order-details .footer .bnt.cancel {
+		color: #aaa;
+		border: 1rpx solid #ddd;
+	}
+
+	.order-details .footer .bnt~.bnt {
+		margin-left: 18rpx;
+	}
+
+	.order-details .writeOff {
+		background-color: #fff;
+		margin-top: 15rpx;
+		padding-bottom: 50rpx;
+	}
+
+	.order-details .writeOff .title {
+		font-size: 30rpx;
+		color: #282828;
+		height: 87rpx;
+		border-bottom: 1px solid #f0f0f0;
+		padding: 0 24rpx;
+		line-height: 87rpx;
+	}
+
+	.order-details .writeOff .grayBg {
+		background-color: #f2f5f7;
+		width: 590rpx;
+		height: 384rpx;
+		border-radius: 20rpx 20rpx 0 0;
+		margin: 50rpx auto 0 auto;
+		padding-top: 55rpx;
+	}
+
+	.order-details .writeOff .grayBg .pictrue {
+		width: 290rpx;
+		height: 290rpx;
+		margin: 0 auto;
+	}
+
+	.order-details .writeOff .grayBg .pictrue image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-details .writeOff .gear {
+		width: 590rpx;
+		height: 30rpx;
+		margin: 0 auto;
+	}
+
+	.order-details .writeOff .gear image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-details .writeOff .num {
+		background-color: #f0c34c;
+		width: 590rpx;
+		height: 84rpx;
+		color: #282828;
+		font-size: 48rpx;
+		margin: 0 auto;
+		border-radius: 0 0 20rpx 20rpx;
+		text-align: center;
+		padding-top: 4rpx;
+	}
+
+	.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: 15rpx;
+		background-color: #fff;
+		padding: 0 24rpx;
+	}
+
+	.order-details .map .place {
+		font-size: 26rpx;
+		width: 176rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		line-height: 50rpx;
+		text-align: center;
+	}
+
+	.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 !important;
+		margin-top: 15rpx;
+		background-color: #fff;
+
+		.title {
+			display: flex;
+			align-items: center;
+			font-size: 30rpx;
+			color: #333;
+			height: 86rpx;
+			border-bottom: 1px solid #f5f5f5;
+            font-weight: 400;
+			padding: 0 24rpx;
+			
+			image {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 10rpx;
+			}
+		}
+
+		.con {
+			font-size: 25rpx;
+			color: #666666;
+			padding: 30rpx 24rpx;
+		}
+	}
+</style>
+
+<script>
+	import {
+		getOrderDetail,
+		orderTake,
+		orderDel,
+		orderCancel,
+		qrcodeApi
+	} from '@/api/order.js';
+	import {
+		openOrderRefundSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import home from '@/components/home';
+	import payment from '@/components/payment';
+	import orderGoods from "@/components/orderGoods";
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
+	// #endif
+	export default {
+		components: {
+			payment,
+			home,
+			orderGoods,
+			// #ifdef MP
+			authorize
+			// #endif
+		},
+		data() {
+			return {
+				codeImg: '',
+				qrcodeSize: 100,
+				order_id: '',
+				evaluate: 0,
+				cartInfo: [], //购物车产品
+				orderInfo: {
+					systemStore: {},
+					pstatus: {}
+				}, //订单详情
+				system_store: {},
+				isGoodsReturn: false, //是否为退款订单
+				status: {}, //订单底部按钮状态
+				isClose: false,
+				payMode: [{
+						name: "微信支付",
+						icon: "icon-weixinzhifu",
+						value: 'weixin',
+						title: '微信快捷支付'
+					},
+					{
+						name: "余额支付",
+						icon: "icon-yuezhifu",
+						value: 'yue',
+						title: '可用余额:',
+						number: 0
+					},
+				],
+				pay_close: false,
+				pay_order_id: '',
+				totalPrice: '0',
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				id: 0, //订单id
+				uniId: '',
+				utils: this.$util,
+				type: 'normal'
+			};
+		},
+		computed: mapGetters(['isLogin', 'chatUrl', 'userInfo']),
+		onLoad: function(options) {
+			options.type == undefined || options.type == null ? this.type = 'normal' : this.type = options.type;
+			if (!options.order_id && !options.uniId) return this.$util.Tips({
+				title: '缺少参数'
+			}, {
+				tab: 3,
+				url: 1
+			});
+			this.$set(this, 'order_id', options.order_id);
+		},
+		onShow() {
+			if (this.isLogin) {
+				this.getOrderInfo();
+				this.payMode[1].number = this.userInfo.nowMoney;
+				this.$set(this, 'payMode', this.payMode);
+			} else {
+				toLogin();
+			}
+		},
+		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
+			 
+		},
+		methods: {
+			kefuClick() {
+				location.href = this.chatUrl;
+			},
+			goGoodCall() {
+				let self = this
+				uni.navigateTo({
+					url: `/pages/customer_list/index?orderId=${self.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.system_store.phone
+				})
+			},
+			/**
+			 * 打开地图
+			 * 
+			 */
+			showMaoLocation: function() {
+				if (!this.system_store.latitude || !this.system_store.longitude) return this.$util.Tips({
+					title: '缺少经纬度信息无法查看地图！'
+				});
+				uni.openLocation({
+					latitude: parseFloat(this.system_store.latitude),
+					longitude: parseFloat(this.system_store.longitude),
+					scale: 8,
+					name: this.system_store.name,
+					address: this.system_store.address + this.system_store.detailedAddress,
+					success: function() {
+
+					},
+				});
+			},
+			/**
+			 * 关闭支付组件
+			 * 
+			 */
+			payClose: function() {
+				this.pay_close = false;
+			},
+			/**
+			 * 打开支付组件
+			 * 
+			 */
+			pay_open: function() {
+				this.pay_close = true;
+				this.pay_order_id = this.orderInfo.orderId;
+				this.totalPrice = this.orderInfo.payPrice;
+			},
+			/**
+			 * 支付成功回调
+			 * 
+			 */
+			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.getOrderInfo();
+			},
+			/**
+			 * 获取订单详细信息
+			 * 
+			 */
+			getOrderInfo: function() {
+				let that = this;
+				uni.showLoading({
+					title: "正在加载中"
+				});
+				getOrderDetail(that.order_id).then(res => {
+					uni.hideLoading();
+					that.$set(that, 'orderInfo', res.data);
+					that.$set(that, 'evaluate', res.data.status == 2 ? 2 : 0);
+					that.$set(that, 'system_store', res.data.systemStore);
+					that.$set(that, 'id', res.data.id);
+					that.$set(that, 'cartInfo', res.data.orderInfoList);
+					if (res.data.refundStatus != 0) {
+						that.isGoodsReturn = true;
+					};
+					if (that.orderInfo.shippingType == 2 && that.orderInfo.paid) that.markCode(res.data
+						.verifyCode);
+					if(that.orderInfo.refundStatus>0){
+						uni.setNavigationBarColor({
+						    frontColor: '#ffffff',
+						    backgroundColor: '#666666'
+						})
+					}	
+				}).catch(err => {
+					uni.hideLoading();
+					that.$util.Tips({
+						title: err
+					}, '/pages/users/order_list/index');
+				});
+			},
+			/**
+			 * 
+			 * 生成二维码
+			 */
+			markCode(text) {
+				qrcodeApi({
+					height: '145',
+					text: text,
+					width: '145'
+				}).then(res => {
+					this.codeImg = res.data.code
+				});
+			},
+			/**
+			 * 
+			 * 剪切订单号
+			 */
+			// #ifndef H5
+			copy: function() {
+				let that = this;
+				uni.setClipboardData({
+					data: this.orderInfo.orderId
+				});
+			},
+			// #endif
+			/**
+			 * 打电话
+			 */
+			goTel: function() {
+				uni.makePhoneCall({
+					phoneNumber: this.orderInfo.deliveryId
+				})
+			},
+			/**
+			 * 设置底部按钮
+			 * 
+			 */
+			getOrderStatus: function() {
+				let orderInfo = this.orderInfo || {},
+					_status = orderInfo.pstatus || {
+						type: 0
+					},
+					status = {};
+				let type = parseInt(_status.type),
+					delivery_type = orderInfo.deliveryType,
+					seckill_id = orderInfo.seckillId ? parseInt(orderInfo.seckillId) : 0,
+					bargain_id = orderInfo.bargainId ? parseInt(orderInfo.bargainId) : 0,
+					combination_id = orderInfo.combinationId ? parseInt(orderInfo.combinationId) : 0;
+				status = {
+					type: type == 9 ? -9 : type,
+					class_status: 0
+				};
+				if (type == 1 && combination_id > 0) status.class_status = 1; //查看拼团
+				if (type == 2 && delivery_type == 'express') status.class_status = 2; //查看物流
+				if (type == 2) status.class_status = 3; //确认收货
+				if (type == 4 || type == 0) status.class_status = 4; //删除订单
+				if (!seckill_id && !bargain_id && !combination_id && (type == 3 || type == 4)) status.class_status =
+				5; //再次购买
+				this.$set(this, 'status', status);
+			},
+			/**
+			 * 去拼团详情
+			 * 
+			 */
+			goJoinPink: function() {
+				uni.navigateTo({
+					url: '/pages/activity/goods_combination_status/index?id=' + this.orderInfo.pinkId,
+				});
+			},
+			/**
+			 * 再此购买
+			 * 
+			 */
+			goOrderConfirm: function() {
+				this.$Order.getPreOrder("again",[{
+					orderNo: this.order_id
+				}]);
+			},
+			confirmOrder: function() {
+				let that = this;
+				uni.showModal({
+					title: '确认收货',
+					content: '为保障权益，请收到货确认无误后，再确认收货',
+					success: function(res) {
+						if (res.confirm) {
+							orderTake(that.id).then(res => {
+								return that.$util.Tips({
+									title: '操作成功',
+									icon: 'success'
+								}, function() {
+									that.getOrderInfo();
+								});
+							}).catch(err => {
+								return that.$util.Tips({
+									title: err
+								});
+							})
+						}
+					}
+				})
+			},
+			/**
+			 * 
+			 * 删除订单
+			 */
+			delOrder: function() {
+				let that = this;
+				orderDel(this.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) {
+							orderCancel(self.orderInfo.id)
+								.then((data) => {
+									self.$util.Tips({
+										title: '取消成功'
+									}, {
+										tab: 3
+									})
+								})
+								.catch(() => {
+									self.$util.Tips({
+										title: err
+									})
+									self.getDetail();
+								});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	.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;
+	}
+</style>
diff --git a/yudao-ui-app/pages/order_details/index.vue b/yudao-ui-app/pages/order_details/index.vue
index caa89d011..de7f77e20 100644
--- a/yudao-ui-app/pages/order_details/index.vue
+++ b/yudao-ui-app/pages/order_details/index.vue
@@ -1,625 +1,107 @@
 <template>
-	<view>
-		<view class='order-details'>
-			<!-- 给header上与data上加on为退款订单-->
-			<view class='header bg-color' :class='isGoodsReturn ? "on":""'>
-				<view class='picTxt acea-row row-middle'>
-					<view class='pictrue' v-if="isGoodsReturn==false">
-						<image :src="orderInfo.statusPic"></image>
-					</view>
-					<view class='data' :class='isGoodsReturn ? "on":""'>
-						<view class='state'>{{orderInfo.orderStatusMsg}}</view>
-						<view>{{orderInfo.createTime}}</view>
-					</view>
-				</view>
+	<view class="container">
+		<u-navbar title="订单详情" bgColor="transparent">
+			<view class="u-nav-slot" slot="left">
+				<u-icon name="arrow-left"></u-icon>
 			</view>
-
-			<view v-if="isGoodsReturn==false" class="pad30">
-				<view class='nav'>
-					<view class='navCon acea-row row-between-wrapper'>
-						<view :class="!orderInfo.paid ? 'on':''">待付款</view>
-						<view :class="orderInfo.paid && orderInfo.status == 0 ? 'on':''">
-							{{orderInfo.shippingType==1 ? '待发货':'待核销'}}</view>
-						<view :class="orderInfo.status == 1 ? 'on':''" v-if="orderInfo.shippingType == 1">待收货</view>
-						<view :class="orderInfo.status == 2 ? 'on':''">待评价</view>
-						<view :class="orderInfo.status == 3 ? 'on':''">已完成</view>
-					</view>
-					<view class='progress acea-row row-between-wrapper'>
-						<view class='iconfont'
-							:class='(!orderInfo.paid ? "icon-webicon318":"icon-yuandianxiao") + " " + ( orderInfo.paid ? "font-color":"")'>
-						</view>
-						<view class='line' :class='orderInfo.paid > 0 ? "bg-color":""'></view>
-						<view class='iconfont'
-							:class='(orderInfo.status == 0 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "font-color":"")'>
-						</view>
-						<view class='line' :class='orderInfo.status > 0 ? "bg-color":""'
-							v-if="orderInfo.shippingType == 1"></view>
-						<view class='iconfont'
-							:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 ? "font-color":"")'
-							v-if="orderInfo.shippingType == 1"></view>
-						<view class='line' :class='orderInfo.status > 1 ? "bg-color":""'></view>
-						<view class='iconfont'
-							:class='(orderInfo.status == 2 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 ? "font-color":"")'>
-						</view>
-						<view class='line' :class='orderInfo.status > 2 ? "bg-color":""'></view>
-						<view class='iconfont'
-							:class='(orderInfo.status == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 3 ? "font-color":"")'>
-						</view>
-					</view>
-				</view>
-				<view v-if="orderInfo.shippingType == 2 && orderInfo.paid" class="writeOff borRadius14">
-					<view class="title">核销信息</view>
-					<view class="grayBg">
-						<view class="pictrue">
-							<!-- <div class="qrcode" ref="qrcode"></div> -->
-							<!-- <canvas canvas-id="qrcode" :style="{width: `${qrcodeSize}100%`, height: `${qrcodeSize}100%`}"/> -->
-							<image :src="codeImg"></image>
-						</view>
-					</view>
-					<view class="gear">
-						<image src="../../static/images/writeOff.jpg"></image>
-					</view>
-					<view class="num">{{orderInfo.verifyCode}}</view>
-					<view class="rules" v-if='orderInfo.systemStore'>
-						<view class="item">
-							<view class="rulesTitle acea-row row-middle">
-								<text class="iconfont icon-shijian"></text>核销时间
-							</view>
-							<view class="info">
-								每日：<text class="time">{{orderInfo.systemStore.dayTime.replace(',','-')}}</text>
-							</view>
-						</view>
-						<view class="item">
-							<view class="rulesTitle acea-row row-middle">
-								<text class="iconfont icon-shuoming1"></text>使用说明
-							</view>
-							<view class="info">可将二维码出示给店员扫描或提供数字核销码</view>
-						</view>
-					</view>
-				</view>
-				<view v-if="orderInfo.shippingType == 2" class="map acea-row row-between-wrapper borRadius14">
-					<view>自提地址信息</view>
-					<view class="place cart-color acea-row row-center-wrapper" @tap="showMaoLocation">
-						<text class="iconfont icon-weizhi"></text>查看位置
-					</view>
-				</view>
-				<view v-if="orderInfo.shippingType === 1" class='address borRadius14'>
-					<view class='name'>{{orderInfo.realName}}<text class='phone'>{{orderInfo.userPhone}}</text></view>
-					<view>{{orderInfo.userAddress}}</view>
-				</view>
-				<view v-else class='address' style="margin-top:15rpx;">
-					<view class='name' @tap="makePhone">{{orderInfo.systemStore?orderInfo.systemStore.name:''}}<text
-							class='phone'>{{orderInfo.systemStore?orderInfo.systemStore.phone:''}}</text><text
-							class="iconfont icon-tonghua font-color"></text></view>
-					<view>{{orderInfo.systemStore?orderInfo.systemStore.detailedAddress:''}}</view>
-				</view>
-
-				<orderGoods :evaluate='evaluate' :productType="orderInfo.type" :orderId="order_id" :ids="id" :uniId="uniId" :cartInfo="cartInfo"
-					:jump="true"></orderGoods>
-				<!-- #ifndef MP -->
-				<div class="goodCall borRadius14" @click="kefuClick">
-					<span class="iconfont icon-kefu"></span><span>联系客服</span>
-				</div>
-				<!-- #endif -->
-				<!-- #ifdef MP -->
-				<div class="goodCall borRadius14">
-					<button open-type='contact' hover-class='none'>
-						<span class="iconfont icon-kefu"></span><span>联系客服</span>
-					</button>
-				</div>
-				<!-- #endif -->
-			</view>
-
-			<view class="pad30">
-				<view class='nav refund' v-if="orderInfo.refundStatus>0">
-					<view class="title">
-						<image src="/static/images/shuoming.png" mode=""></image>
-						{{orderInfo.refundStatus==1?'商家审核中':orderInfo.refundStatus==2?'商家已退款':'商家拒绝退款'}}
-					</view>
-					<view class="con pad30">{{orderInfo.refundStatus==1 ? "您已成功发起退款申请，请耐心等待商家处理；退款前请与商家协商一致，有助于更好的处理售后问题": orderInfo.refundStatus==2? "退款已成功受理，如商家已寄出商品请尽快退回；感谢您的支持": "拒绝原因：" + orderInfo.refundReason}}</view>
-				</view>
-				<view class='wrapper borRadius14'>
-					<view class='item acea-row row-between'>
-						<view>订单编号：</view>
-						<view class='conter acea-row row-middle row-right'>{{orderInfo.orderId}}
-							<!-- #ifndef H5 -->
-							<text class='copy' @tap='copy'>复制</text>
-							<!-- #endif -->
-							<!-- #ifdef H5 -->
-							<text class='copy copy-data' :data-clipboard-text="orderInfo.orderId">复制</text>
-							<!-- #endif -->
-						</view>
-					</view>
-					<view class='item acea-row row-between'>
-						<view>下单时间：</view>
-						<view class='conter'>{{(orderInfo.createTime || 0)}}</view>
-					</view>
-					<view class='item acea-row row-between'>
-						<view>支付状态：</view>
-						<view class='conter' v-if="orderInfo.paid">已支付</view>
-						<view class='conter' v-else>未支付</view>
-					</view>
-					<view class='item acea-row row-between'>
-						<view>支付方式：</view>
-						<view class='conter'>{{orderInfo.payTypeStr}}</view>
-					</view>
-					<view class='item acea-row row-between' v-if="orderInfo.mark">
-						<view>买家留言：</view>
-						<view class='conter'>{{orderInfo.mark}}</view>
-					</view>
-				</view>
-				<!-- 退款订单详情 "-->
-				<view v-if="isGoodsReturn" class='wrapper borRadius14' >
-					<view class='item acea-row row-between'>
-						<view>收货人：</view>
-						<view class='conter'>{{orderInfo.realName}}</view>
-					</view>
-					<view class='item acea-row row-between'>
-						<view>联系电话：</view>
-						<view class='conter'>{{orderInfo.userPhone}}</view>
-					</view>
-					<view class='item acea-row row-between'>
-						<view>收货地址：</view>
-						<view class='conter'>{{orderInfo.userAddress}}</view>
-					</view>
-				</view>
-				<view v-if="orderInfo.status>0">
-					<view class='wrapper borRadius14' v-if='orderInfo.deliveryType=="express"'>
-						<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.deliveryName || ''}}</view>
-						</view>
-						<view class='item acea-row row-between'>
-							<view>快递号：</view>
-							<view class='conter'>{{orderInfo.deliveryId || ''}}</view>
-						</view>
-					</view>
-					<view class='wrapper borRadius14' v-else-if='orderInfo.deliveryType=="send"'>
-						<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.deliveryName || ''}}</view>
-						</view>
-						<view class='item acea-row row-between'>
-							<view>联系电话：</view>
-							<view class='conter acea-row row-middle row-right'>{{orderInfo.deliveryId || ''}}<text
-									class='copy' @tap='goTel'>拨打</text></view>
-						</view>
-					</view>
-					<view class='wrapper borRadius14' v-else-if='orderInfo.deliveryType=="fictitious"'>
-						<view class='item acea-row row-between'>
-							<view>虚拟发货：</view>
-							<view class='conter'>已发货，请注意查收</view>
-						</view>
-					</view>
-				</view>
-				<view class='wrapper borRadius14'>
-					<view class='item acea-row row-between'>
-						<view>商品总价：</view>
-						<view class='conter'>￥{{orderInfo.proTotalPrice}}</view>
-					</view>
-					<view class='item acea-row row-between' v-if="orderInfo.payPostage > 0">
-						<view>运费：</view>
-						<view class='conter'>￥{{orderInfo.payPostage}}</view>
-					</view>
-					<view class='item acea-row row-between' v-if='orderInfo.couponId'>
-						<view>优惠券抵扣：</view>
-						<view class='conter'>-￥{{orderInfo.couponPrice}}</view>
-					</view>
-					<view class='item acea-row row-between' v-if="orderInfo.useIntegral > 0">
-						<view>积分抵扣：</view>
-							<view class='conter'>-￥{{orderInfo.deductionPrice}}</view>
-					</view>
-					<view class='actualPay acea-row row-right'>实付款：<text
-							class='money font-color'>￥{{orderInfo.payPrice}}</text></view>
-				</view>
-				<view style='height:120rpx;'></view>
-				<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
-					<view class="qs-btn" v-if="!orderInfo.paid" @click.stop="cancelOrder">取消订单</view>
-					<view class='bnt bg-color' v-if="!orderInfo.paid" @tap='pay_open(orderInfo.orderId)'>立即付款</view>
-					<!-- #ifdef MP -->
-					<view @tap="openSubcribe('/pages/users/goods_return/index?orderId='+orderInfo.orderId)"
-						class='bnt cancel' v-else-if="orderInfo.paid === true && orderInfo.refundStatus === 0 && orderInfo.type!==1 && type==='normal'">申请退款
-					</view>
-					<!-- #endif -->
-					<!-- #ifndef MP -->
-					<navigator hover-class="none" :url="'/pages/users/goods_return/index?orderId='+orderInfo.orderId"
-						class='bnt cancel' v-else-if="orderInfo.paid === true && orderInfo.refundStatus === 0 && orderInfo.type!==1 && type==='normal'">申请退款
-					</navigator>
-					<!-- #endif -->
-					<view class='bnt bg-color' v-if="orderInfo.combinationId > 0" @tap='goJoinPink'>查看拼团</view>
-					<navigator class='bnt cancel' v-if="orderInfo.deliveryType == 'express' && orderInfo.status >0"
-						hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.orderId">查看物流
-					</navigator>
-					<view class='bnt bg-color' v-if="orderInfo.status==1" @tap='confirmOrder'>确认收货</view>
-					<view class='bnt cancel' v-if="orderInfo.status==3" @tap='delOrder'>删除订单</view>
-					<view class='bnt bg-color' v-if="orderInfo.status==3 && orderInfo.type!==1" @tap='goOrderConfirm'>再次购买</view>
-				</view>
-			</view>
-
-
+		</u-navbar>
+		<view class="bg">
+			<image src="@/static/images/shop/cart_bg.png"></image>
 		</view>
-		<home></home>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
-		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
-			:totalPrice='totalPrice'></payment>
+		<view class="box">
+			<view class="top">
+				<view class="navigation"></view>
+				<view class="address">
+					<view class="name">收件人：张三 {{orderInfo.userPhone}}</view>
+					<text class="detail">{{orderInfo.userAddress}}</text>
+				</view>
+				<view class="go"></view>
+			</view>
+			<view class="goodsDetail">
+				<view class="boxs"></view>
+				<view class="tops">
+					<view class="shopName">
+						古驰旗舰店>
+					</view>
+				</view>
+				<view class="content">
+					<view class="image">
+						<u--image :showLoading="true"  radius="10rpx" src="https://cdn.uviewui.com/uview/album/1.jpg" width="111rpx"
+							height="99rpx" @click="click"></u--image>
+					</view>
+					<view class="text">
+						<view class="name">
+							GUCCI/古驰HADLEY 21号
+						</view>
+						<view class="model">
+							Gucci Blondie小号托特包
+						</view>
+						<view class="prices">
+							<u--text color="#E50202" mode="price" :text="orderInfo.totalPrice"></u--text>
+						</view>
+					</view>
+					<div class="sum">x1</div>
+				</view>
+				<view class="boxs"></view>
+			</view>
+			<view class="price">
+				<view style="height: 1rpx;"></view>
+				<view class="priceitems">
+					<text class="itemsleft">商品总价</text>
+					<text class="itemsright"><u--text mode="price" :text="orderInfo.proTotalPrice"></u--text></text>
+				</view>
+				<view class="priceitems">
+					<text class="itemsleft">运费</text>
+					<text class="itemsright"><u--text mode="price" :text="orderInfo.payPostage"></u--text></text>
+				</view>
+				<view class="priceitems">
+					<text class="itemsleft">待付金额</text>
+					<text class="itemsright"><u--text mode="price" :text="orderInfo.totalPrice"></u--text></text>
+				</view>
+			</view>
+			<view class="detail">
+				<view style="height: 1rpx;"></view>
+				<view class="title">订单信息</view>
+				<view class="detailitems">
+					<text class="detailleft">订单备注：</text>
+					<text class="detailright">{{orderInfo.mark}}</text>
+				</view>
+				<view class="detailitems">
+					<text class="detailleft">订单编号：</text>
+					<text class="detailright">{{orderInfo.orderId}}</text>
+				</view>
+				<view class="detailitems">
+					<text class="detailleft">创建时间：</text>
+					<text class="detailright">{{orderInfo.createTime}}</text>
+				</view>
+			</view>
+			<view class="pay">
+				<view style="height: 1rpx;"></view>
+				<view class="title">支付方式</view>
+				<view class="payment" @click="isWx=!isWx">
+						<view class="mode">
+							<text class="wechat"></text>
+							<text style="width: 140rpx;">微信支付</text>
+							<view :class="[isWx?'radioNo':'radio']"></view>
+						</view>
+				</view>
+				<view class="payment" @click="isWx=!isWx">
+						<view class="mode">
+							<text class="zfb"></text>
+							<text style="width: 140rpx;">支付宝支付</text>
+							<view :class="[isWx?'radio':'radioNo']"></view>
+						</view>
+				</view>
+			</view>
+		</view>
+		<view class="zf">
+			<view class="zfNumber">待支付: <text>￥123</text> </view>
+			<view class="closeOrder" tap="cancelOrder()">取消订单</view>
+			<view class="orderPay" @tap='pay_open(orderInfo.orderId)'>立即付款</view>
+		</view>
+	
 	</view>
 </template>
-<style scoped lang="scss">
-	.shuoming{
-		width: 32rpx;
-		height: 32rpx;
-	}
-	.goodCall {
-		color: $theme-color;
-		text-align: center;
-		width: 100%;
-		height: 86rpx;
-		padding: 0 30rpx;
-		border-bottom: 1rpx solid #eee;
-		font-size: 30rpx;
-		line-height: 86rpx;
-		background: #fff;
-
-		.icon-kefu {
-			font-size: 36rpx;
-			margin-right: 15rpx;
-		}
-
-		/* #ifdef MP */
-		button {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			height: 86rpx;
-			font-size: 30rpx;
-			color: $theme-color;
-		}
-
-		/* #endif */
-	}
-
-	.order-details .header {
-		height: 250rpx;
-		padding: 0 30rpx;
-	}
-
-	.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;
-	}
-
-	.order-details .header .data .time {
-		margin-left: 20rpx;
-	}
-
-	.picTxt {
-		height: 150rpx;
-	}
-
-	.order-details .nav {
-		background-color: #fff;
-		font-size: 26rpx;
-		color: #282828;
-		padding: 27rpx 0;
-		width: 100%;
-		border-radius: 14rpx;
-		margin: -100rpx auto 0 auto;
-	}
-
-	.order-details .nav .navCon {
-		padding: 0 40rpx;
-	}
-
-	.order-details .nav .on {
-		color: $theme-color;
-	}
-
-	.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: 15rpx;
-		padding: 30rpx 24rpx;
-	}
-
-	.order-details .address .name {
-		font-size: 30rpx;
-		color: #282828;
-		margin-bottom: 15rpx;
-	}
-
-	.order-details .address .name .phone {
-		margin-left: 40rpx;
-	}
-
-	.order-details .line {
-		width: 100%;
-		height: 3rpx;
-	}
-
-	.order-details .line image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.order-details .wrapper {
-		background-color: #fff;
-		margin-top: 12rpx;
-		padding: 30rpx 24rpx;
-	}
-
-	.order-details .wrapper .item {
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.order-details .wrapper .item~.item {
-		margin-top: 20rpx;
-	}
-
-	.order-details .wrapper .item .conter {
-		color: #868686;
-		// width: 490rpx;
-		text-align: right;
-	}
-
-	.order-details .wrapper .item .conter .copy {
-		font-size: 20rpx;
-		color: #333;
-		border-radius: 20rpx;
-		border: 1rpx solid #666;
-		padding: 3rpx 15rpx;
-		margin-left: 24rpx;
-	}
-
-	.order-details .wrapper .actualPay {
-		border-top: 1rpx solid #eee;
-		margin-top: 30rpx;
-		padding-top: 30rpx;
-	}
-
-	.order-details .wrapper .actualPay .money {
-		font-weight: bold;
-		font-size: 30rpx;
-	}
-
-	.order-details .footer {
-		width: 100%;
-		height: 100rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-	}
-
-	.order-details .footer .bnt {
-		width: 158rpx;
-		height: 54rpx;
-		text-align: center;
-		line-height: 54rpx;
-		border-radius: 50rpx;
-		color: #fff;
-		font-size: 27rpx;
-	}
-
-	.order-details .footer .bnt.cancel {
-		color: #aaa;
-		border: 1rpx solid #ddd;
-	}
-
-	.order-details .footer .bnt~.bnt {
-		margin-left: 18rpx;
-	}
-
-	.order-details .writeOff {
-		background-color: #fff;
-		margin-top: 15rpx;
-		padding-bottom: 50rpx;
-	}
-
-	.order-details .writeOff .title {
-		font-size: 30rpx;
-		color: #282828;
-		height: 87rpx;
-		border-bottom: 1px solid #f0f0f0;
-		padding: 0 24rpx;
-		line-height: 87rpx;
-	}
-
-	.order-details .writeOff .grayBg {
-		background-color: #f2f5f7;
-		width: 590rpx;
-		height: 384rpx;
-		border-radius: 20rpx 20rpx 0 0;
-		margin: 50rpx auto 0 auto;
-		padding-top: 55rpx;
-	}
-
-	.order-details .writeOff .grayBg .pictrue {
-		width: 290rpx;
-		height: 290rpx;
-		margin: 0 auto;
-	}
-
-	.order-details .writeOff .grayBg .pictrue image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.order-details .writeOff .gear {
-		width: 590rpx;
-		height: 30rpx;
-		margin: 0 auto;
-	}
-
-	.order-details .writeOff .gear image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.order-details .writeOff .num {
-		background-color: #f0c34c;
-		width: 590rpx;
-		height: 84rpx;
-		color: #282828;
-		font-size: 48rpx;
-		margin: 0 auto;
-		border-radius: 0 0 20rpx 20rpx;
-		text-align: center;
-		padding-top: 4rpx;
-	}
-
-	.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: 15rpx;
-		background-color: #fff;
-		padding: 0 24rpx;
-	}
-
-	.order-details .map .place {
-		font-size: 26rpx;
-		width: 176rpx;
-		height: 50rpx;
-		border-radius: 25rpx;
-		line-height: 50rpx;
-		text-align: center;
-	}
-
-	.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 !important;
-		margin-top: 15rpx;
-		background-color: #fff;
-
-		.title {
-			display: flex;
-			align-items: center;
-			font-size: 30rpx;
-			color: #333;
-			height: 86rpx;
-			border-bottom: 1px solid #f5f5f5;
-            font-weight: 400;
-			padding: 0 24rpx;
-			
-			image {
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.con {
-			font-size: 25rpx;
-			color: #666666;
-			padding: 30rpx 24rpx;
-		}
-	}
-</style>
 
 <script>
 	import {
@@ -661,15 +143,27 @@
 				qrcodeSize: 100,
 				order_id: '',
 				evaluate: 0,
+		
 				cartInfo: [], //购物车产品
 				orderInfo: {
 					systemStore: {},
 					pstatus: {}
 				}, //订单详情
 				system_store: {},
+				isWx: true,
 				isGoodsReturn: false, //是否为退款订单
 				status: {}, //订单底部按钮状态
 				isClose: false,
+				ispay: '微信支付',
+				topay: [{
+						name: '微信支付',
+						value: 'wx'
+					},
+					{
+						name: '支付宝支付',
+						value: 'zfb'
+					}
+				],
 				payMode: [{
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
@@ -707,13 +201,15 @@
 			this.$set(this, 'order_id', options.order_id);
 		},
 		onShow() {
+			this.getOrderInfo()
 			if (this.isLogin) {
 				this.getOrderInfo();
 				this.payMode[1].number = this.userInfo.nowMoney;
 				this.$set(this, 'payMode', this.payMode);
-			} else {
-				toLogin();
 			}
+			// else {
+			// 	toLogin();
+			// }
 		},
 		onHide: function() {
 			this.isClose = true;
@@ -729,7 +225,7 @@
 				});
 			});
 			// #endif
-			 
+
 		},
 		methods: {
 			kefuClick() {
@@ -844,6 +340,7 @@
 				getOrderDetail(that.order_id).then(res => {
 					uni.hideLoading();
 					that.$set(that, 'orderInfo', res.data);
+					console.log(that.orderInfo, 'orderInfo')
 					that.$set(that, 'evaluate', res.data.status == 2 ? 2 : 0);
 					that.$set(that, 'system_store', res.data.systemStore);
 					that.$set(that, 'id', res.data.id);
@@ -853,12 +350,12 @@
 					};
 					if (that.orderInfo.shippingType == 2 && that.orderInfo.paid) that.markCode(res.data
 						.verifyCode);
-					if(that.orderInfo.refundStatus>0){
+					if (that.orderInfo.refundStatus > 0) {
 						uni.setNavigationBarColor({
-						    frontColor: '#ffffff',
-						    backgroundColor: '#666666'
+							frontColor: '#ffffff',
+							backgroundColor: '#666666'
 						})
-					}	
+					}
 				}).catch(err => {
 					uni.hideLoading();
 					that.$util.Tips({
@@ -923,7 +420,7 @@
 				if (type == 2) status.class_status = 3; //确认收货
 				if (type == 4 || type == 0) status.class_status = 4; //删除订单
 				if (!seckill_id && !bargain_id && !combination_id && (type == 3 || type == 4)) status.class_status =
-				5; //再次购买
+					5; //再次购买
 				this.$set(this, 'status', status);
 			},
 			/**
@@ -940,7 +437,7 @@
 			 * 
 			 */
 			goOrderConfirm: function() {
-				this.$Order.getPreOrder("again",[{
+				this.$Order.getPreOrder("again", [{
 					orderNo: this.order_id
 				}]);
 			},
@@ -1018,18 +515,367 @@
 	}
 </script>
 
-<style>
-	.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;
+<style lang="scss">
+	.container {
+		position: relative;
+		width: 100%;
+		height: 100%;
+
+		.bg {
+			width: 100%;
+			height: 100%;
+			z-index: 0;
+
+			image {
+				width: 100%;
+				height: 100%;
+				// overflow: hidden;
+				object-fit: cover;
+			}
+		}
+
+		.box {
+			position: absolute;
+			top: 110rpx;
+			width: 100%;
+			height: 1100rpx;
+			overflow: scroll;
+			padding-bottom: 100rpx;
+
+			.top {
+
+				margin-left: 42rpx;
+				width: 669rpx;
+				height: 137rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-around;
+				background: #fff;
+				border-radius: 20rpx;
+
+				.navigation {
+					width: 66rpx;
+					height: 66rpx;
+					background: url(@/static/images/shop/navigation.png);
+					background-size: 100% 100%;
+				}
+
+				.address {
+					width: 471rpx;
+					height: 70rpx;
+
+					.name {
+						font-size: 30rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
+
+					.detail {
+						margin: 0;
+						font-size: 24rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #8C8C8C;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+				}
+
+				.go {
+					width: 10rpx;
+					height: 16rpx;
+					background: url(@/static/images/shop/go.png);
+					background-size: 100% 100%;
+				}
+			}
+
+			.goodsDetail {
+				margin-top: 23rpx;
+				margin-left: 42rpx;
+				width: 669rpx;
+				background: #fff;
+				border-radius: 20rpx;
+
+				.boxs {
+					width: 100%;
+					height: 22rpx;
+				}
+
+				.tops {
+					margin-left: 26rpx;
+					display: flex;
+					justify-content: space-between;
+
+					.shopName {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
+
+					.state {
+						margin-right: 31rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #EF1E5F;
+					}
+				}
+
+				.content {
+					position: relative;
+					margin-top: 32rpx;
+					width: 100%;
+					height: 260rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					height: 110rpx;
+
+					.image {
+						margin-left: 35rpx;
+					}
+
+					.text {
+						width: 420rpx;
+						height: 100%;
+						margin-right: 60rpx;
+
+						.name {
+							font-size: 26rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #000000;
+						}
+
+						.model {
+							margin: 10rpx 0;
+							font-size: 24rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #B7B7B7;
+						}
+
+						.prices {
+							font-size: 26rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #E94343;
+						}
+					}
+
+					.sum {
+						position: absolute;
+						right: 33rpx;
+						bottom: 0rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #E94343;
+					}
+				}
+			}
+
+			.price {
+				margin-top: 23rpx;
+				margin-left: 42rpx;
+				width: 669rpx;
+				height: 204rpx;
+				background: #fff;
+				border-radius: 20rpx;
+
+				.priceitems {
+					margin-top: 27rpx;
+					display: flex;
+					justify-content: space-between;
+
+					.itemsleft {
+						margin-left: 30rpx;
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
+
+					.itemsright {
+						margin-right: 30rpx;
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
+				}
+			}
+
+			.detail {
+				margin-top: 23rpx;
+				margin-left: 42rpx;
+				width: 669rpx;
+				height: 268rpx;
+				background: #fff;
+				border-radius: 20rpx;
+
+				.title {
+					margin-top: 24rpx;
+					margin-left: 29rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #000000;
+
+				}
+
+				.detailitems {
+					margin-top: 27rpx;
+					display: flex;
+					justify-content: space-between;
+
+					.detailleft {
+						margin-left: 30rpx;
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
+
+					.detailright {
+						margin-right: 30rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #7F7F7F;
+					}
+				}
+			}
+
+			.pay {
+				margin-top: 23rpx;
+				margin-left: 42rpx;
+				width: 669rpx;
+				height: 228rpx;
+				background: #fff;
+				border-radius: 20rpx;
+
+				.title {
+					margin-top: 24rpx;
+					margin-left: 29rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #000000;
+				}
+
+				.payment {
+
+					// display: flex;
+					.mode {
+						display: flex;
+						margin-left: 28rpx;
+						margin-top: 30rpx;
+
+						.wechat {
+							display: inline-block;
+							width: 40rpx;
+							height: 40rpx;
+							background: url(@/static/images/shop/wechat.png);
+							background-size: 100% 100%;
+						}
+
+						text {
+							font-size: 28rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #000000;
+						}
+
+						.zfb {
+							display: inline-block;
+							width: 40rpx;
+							height: 40rpx;
+							background: url(@/static/images/shop/zfb.png);
+							background-size: 100% 100%;
+						}
+
+						.radio {
+							width: 34rpx;
+							height: 34rpx;
+							background: url(@/static/images/shop/nochecked.png);
+							background-size: 100% 100%;
+							margin-left: 400rpx;
+						}
+						.radioNo {
+							width: 34rpx;
+							height: 34rpx;
+							background: url(@/static/images/shop/checked.png);
+							background-size: 100% 100%;
+							margin-left: 400rpx;
+						}
+					}
+
+				}
+
+			}
+		}
+
+		.zf {
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			height: 176rpx;
+			background: #fff;
+
+			.zfNumber {
+				position: absolute;
+				left: 52rpx;
+				top: 58rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #0C0C0C;
+
+				text {
+					font-size: 35rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #000000;
+				}
+			}
+
+			
+
+			.closeOrder {
+				position: absolute;
+				top: 48rpx;
+				right: 230rpx;
+				width: 179rpx;
+				height: 64rpx;
+				text-align: center;
+				line-height: 64rpx;
+				border: 1px solid #808080;
+				border-radius: 31rpx;
+				font-size: 29rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #000000;
+			}
+
+			.orderPay {
+				position: absolute;
+				top: 48rpx;
+				right: 34rpx;
+				width: 178rpx;
+				height: 63rpx;
+				line-height: 63rpx;
+				text-align: center;
+				background: linear-gradient(0deg, #FF7495 0%, #F22360 100%);
+				border-radius: 31rpx;
+				font-size: 29rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+		}
 	}
 </style>
diff --git a/yudao-ui-app/pages/users/order_confirm/index.vue b/yudao-ui-app/pages/users/order_confirm/index.vue
index 33043e6a3..7d667ebe0 100644
--- a/yudao-ui-app/pages/users/order_confirm/index.vue
+++ b/yudao-ui-app/pages/users/order_confirm/index.vue
@@ -111,7 +111,7 @@
 						<view class='list'>
 							<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":"")'>
@@ -952,6 +952,7 @@
 					payChannel: that.payChannel
 
 				};
+				console.log(that.system_store.phone,'data')
 				if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
 					return that.$util
 						.Tips({
diff --git a/yudao-ui-app/pages/users/order_list/index.vue b/yudao-ui-app/pages/users/order_list/index.vue
index 95523454f..86770e065 100644
--- a/yudao-ui-app/pages/users/order_list/index.vue
+++ b/yudao-ui-app/pages/users/order_list/index.vue
@@ -1,110 +1,74 @@
 <template>
-	<view>
-		<view class='my-order'>
-			<view class='header bg-color'>
-				<view class='picTxt acea-row row-between-wrapper'>
-					<view class='text'>
-						<view class='name'>订单信息</view>
-						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{Number(orderData.sumPrice).toFixed(2) || 0}}</view>
+	<view class="container">
+		<view class="navbar">
+			<u-sticky bgColor="#fff">
+				<u-navbar>
+					<view class="navbar-left" v-slot="left">
+						<u-icon name="arrow-left"></u-icon>
 					</view>
-					<view class='pictrue'>
-						<image src='../../../static/images/orderTime.png'></image>
-					</view>
-				</view>
-			</view>
-			<view class='nav acea-row row-around'>
-				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
-					<view>待付款</view>
-					<view class='num'>{{orderData.unPaidCount || 0}}</view>
-				</view>
-				<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
-					<view>待发货</view>
-					<view class='num'>{{orderData.unShippedCount || 0}}</view>
-				</view>
-				<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
-					<view>待收货</view>
-					<view class='num '>{{orderData.receivedCount || 0}}</view>
-				</view>
-				<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
-					<view>待评价</view>
-					<view class='num'>{{orderData.evaluatedCount || 0}}</view>
-				</view>
-				<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
-					<view>已完成</view>
-					<view class='num'>{{orderData.completeCount || 0}}</view>
-				</view>
-			</view>
-			<view class='list'>
-				<view class='item' v-for="(item,index) in orderList" :key="index">
-					<view @click='goOrderDetails(item.orderId)'>
-						<view class='title acea-row row-between-wrapper'>
-							<view class="acea-row row-middle">
-								<text class="sign cart-color acea-row row-center-wrapper" v-if="item.activityType !== '普通' && item.activityType !== '核销'">{{item.activityType}}</text>
-								<!-- <text class="sign cart-color acea-row row-center-wrapper" v-if="item.bargainId != 0">砍价</text>
-								<text class="sign cart-color acea-row row-center-wrapper" v-else-if="item.storeOrder.combinationId != 0">拼团</text>
-								<text class="sign cart-color acea-row row-center-wrapper" v-else-if="item.storeOrder.seckillId != 0">秒杀</text> -->
-								<view>{{item.createTime}}</view>
+					<template v-slot="center ">
+						<view class="search">
+							<view class="icon">
+								<u-icon name="search" size="44rpx"></u-icon>
 							</view>
-							<view class='font-color'>{{item.orderStatus}}</view>
-							<!-- <view v-if="item.status?item.status.type == 0:0" class='font-color'>待付款</view>
-							<view v-else-if="item.status?item.status.type == 1:0 && item.storeOrder.shippingType==1" class='font-color'>待发货</view>
-							<view v-else-if="item.status?item.status.type == 2:0 && item.storeOrder.shippingType==1" class='font-color'>待收货</view>
-							<view v-else-if="item.status?item.status.type == 3:0 && item.storeOrder.shippingType==1" class='font-color'>待评价</view>
-							<view v-else-if="item.status?item.status.type == 4:0 && item.storeOrder.shippingType==1" class='font-color'>已完成</view>
-							<view v-else-if="item.storeOrder.shippingType==2" class='font-color'>待核销</view> -->
+
+							<view class="input">
+								<u--input placeholder="请输入内容" v-model="value" @change="change"></u--input>
+							</view>
+							<view class="button">搜索</view>
 						</view>
-						<view class='item-info acea-row row-between row-top' v-for="(items,index) in item.orderInfoList" :key="index">
-							<view class='pictrue'>
-								<image :src='items.image'></image>
-							</view>
-							<view class='text acea-row row-between'>
-								<view class='name line2'>{{items.storeName}}</view>
-								<view class='money'>
-									<view>￥{{items.price}}</view>
-									<view>x{{items.cartNum}}</view>
-								</view>
-							</view>
+					</template>
+				</u-navbar>
+			</u-sticky>
+
+		</view>
+		<view class="tabs">
+			<u-tabs :list="list1" @tap="click" lineWidth="60rpx" lineHeight="9rpx"></u-tabs>
+		</view>
+
+		<!-- <view class="item" @tap="goOrderDetails(123)">
+			
+		</view> -->
+		<view class='list' v-if="status='0'">
+			<!-- <view class='item' v-for="(item,index) in orderList" :key="index"> -->
+			<view class='item' v-for="(item,index) in orderList" :key="item.id">
+				<view @tap='goOrderDetails(item.orderId)'>
+					<view class="box"></view>
+					<view class="top">
+						<view class="shopName">
+							古驰旗舰店
 						</view>
-						<view class='totalPrice'>共{{item.totalNum}}件商品，总金额
-							<text class='money font-color'>￥{{item.payPrice}}</text>
+						<view class="state">
+							{{getStatus(item.status)}}
 						</view>
 					</view>
-					<view class='bottom acea-row row-right row-middle'>
-						<view class='bnt cancelBnt' v-if="!item.paid" @click='cancelOrder(index,item.id)'>取消订单</view>
-						<view class='bnt bg-color' v-if="!item.paid" @click='goPay(item.payPrice,item.orderId)'>立即付款</view>
-						<view class='bnt bg-color' v-else-if="item.status== 0 || item.status== 1 || item.status== 3" @click='goOrderDetails(item.orderId)'>查看详情</view>
-						<view class='bnt bg-color' v-else-if="item.status==2" @click='goOrderDetails(item.orderId)'>去评价</view>
-						<view class='bnt cancelBnt' v-if="item.status == 3" @click='delOrder(item.id,index)'>删除订单</view>
+					<view class="content">
+						<view class="image">
+							<u--image :showLoading="true" radius="10rpx" src="https://cdn.uviewui.com/uview/album/1.jpg" width="111rpx"
+								height="99rpx" @tap="click"></u--image>
+						</view>
+						<view class="text">
+							<view class="name">
+								GUCCI/古驰HADLEY 21号
+							</view>
+							<view class="model">
+								Gucci Blondie小号托特包
+							</view>
+							<view class="price">
+								￥{{item.payPrice}}
+							</view>
+						</view>
 					</view>
-					<!-- <view class='bottom acea-row row-right row-middle'>
-						<view class='bnt cancelBnt' v-if="item.status?item.status.type==0:0 || item.status?item.status.type == 9:0" @click='cancelOrder(index,item.id)'>取消订单</view>
-						<view class='bnt bg-color' v-if="item.status?item.status.type == 0:0" @click='goPay(item.payPrice,item.orderId)'>立即付款</view>
-						<view class='bnt bg-color' v-else-if="item.status?item.status.type == 1:0 || item.status?item.status.type == 9:0" @click='goOrderDetails(item.orderId)'>查看详情</view>
-						<view class='bnt bg-color' v-else-if="item.status?item.status.type == 2:0 && item.status.deliveryType" @click='goOrderDetails(item.orderId)'>查看详情</view>
-						<view class='bnt bg-color' v-else-if="item.status?item.status.type == 3:0" @click='goOrderDetails(item.orderId)'>去评价</view>
-						<view class='bnt bg-color' v-else-if="item.storeOrder.seckillId < 1 && item.storeOrder.bargainId < 1 && item.storeOrder.combinationId < 1 && item.status?item.status.type == 4:0"
-						 @click='goOrderDetails(item.orderId)'>再次购买</view>
-						<view class='bnt cancelBnt' v-if="item.status?item.status.type == 4:0" @click='delOrder(item.id,index)'>删除订单</view>
-					</view> -->
 				</view>
 			</view>
-			<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>0">
-				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-			</view>
 			<view v-if="orderList.length == 0">
 				<emptyPage title="暂无订单~"></emptyPage>
 			</view>
 		</view>
-		<view class='noCart' v-if="orderList.length == 0 && page > 1">
-			<view class='pictrue'>
-				<image src='/images/noOrder.png'></image>
-			</view>
-		</view>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
-		<home></home>
-		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
+		<!-- <view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>0">
+			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+		</view> -->
+		
 	</view>
 </template>
 
@@ -148,7 +112,30 @@
 				orderData: {}, //订单详细统计
 				orderStatus: 0, //订单状态
 				page: 1,
+				list1: [{
+					name: '全部',
+					value: ''
+				}, {
+					name: '待付款',
+					value: '0'
+				}, {
+					name: '待发货',
+					value: '1'
+				}, {
+					name: '已完成',
+					value: '2'
+				}, {
+					name: '售后中',
+					value: '3'
+				}, {
+					name: '已关闭',
+					value: '4'
+				}],
 				limit: 20,
+				itemList: [],
+				currentPage: 1,
+				listTitle: '',
+				pageSize: 10,
 				payMode: [{
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
@@ -171,6 +158,9 @@
 			};
 		},
 		computed: mapGetters(['isLogin', 'userInfo']),
+		onLoad() {
+			this.loadmore()
+		},
 		onShow() {
 			if (this.isLogin) {
 				this.loadend = false;
@@ -180,11 +170,65 @@
 				this.getOrderList();
 				this.payMode[1].number = this.userInfo.nowMoney;
 				this.$set(this, 'payMode', this.payMode);
-			} else {
-				toLogin();
 			}
+			// else {
+			// 	toLogin();
+			// }
 		},
 		methods: {
+			getStatus(val) {
+				if (val == '0') {
+					return '待发货'
+				}
+				if (val == '1') {
+					return '待收货'
+				}
+				if (val == '2') {
+					return '已收货'
+				}
+				if (val == '3') {
+					return '待评价'
+				}
+				if (val == '4') {
+					return '已完成'
+				}
+			},
+			loadMore() {
+				// 模拟异步请求数据
+				setTimeout(() => {
+					// 假设请求返回的数据是新的列表项
+					const newItems = Array.from({
+						length: this.pageSize
+					}, (_, index) => `Item ${index + 1}`);
+
+					// 将新的列表项添加到现有列表中
+					this.itemList = this.itemList.concat(newItems);
+					this.currentPage++;
+				}, 1000);
+			},
+			scrolltolower() {
+				this.loadmore()
+			},
+			loadmore() {
+				for (let i = 0; i < 30; i++) {
+					this.indexList.push({
+						url: this.urls[uni.$u.random(0, this.urls.length - 1)]
+					})
+				}
+			},
+			click(item) {
+				console.log(item.value,1)
+				if (item.value == this.orderStatus) return;
+				this.orderStatus = item.value
+				console.log(this.orderStatus)
+				this.loadend = false;
+				this.page = 1;
+				this.loadend = false;
+				this.$set(this, 'orderList', []);
+				this.getOrderData();
+				this.getOrderList()
+				
+			},
 			onLoadFun() {
 				this.getOrderData();
 				this.getOrderList();
@@ -236,7 +280,7 @@
 					title: '缺少订单号无法取消订单'
 				});
 				uni.showLoading({
-				    title: '正在删除中'
+					title: '正在删除中'
 				});
 				orderCancel(order_id).then(res => {
 					uni.hideLoading();
@@ -371,180 +415,130 @@
 		},
 		onReachBottom: function() {
 			this.getOrderList();
+		},
+		mounted() {
+			this.loadMore();
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	.my-order .header {
-		height: 250rpx;
-		padding: 0 30rpx;
-	}
+	.container {
+		.tabs {
+			width: 100%;
+			height: 100rpx;
+			background: #fff;
+			margin-top: 88rpx;
+		}
 
-	.my-order .header .picTxt {
-		height: 190rpx;
-	}
+		.list {
+			width: 100%;
+			height: 100vh;
 
-	.my-order .header .picTxt .text {
-		color: rgba(255, 255, 255, 0.8);
-		font-size: 26rpx;
-		font-family: 'Guildford Pro';
-	}
+			.item {
+				margin-top: 21rpx;
+				margin-left: 40rpx;
+				width: 669rpx;
+				height: 238rpx;
+				background: #fff;
+				border-radius: 20rpx;
 
-	.my-order .header .picTxt .text .name {
-		font-size: 34rpx;
-		font-weight: bold;
-		color: #fff;
-		margin-bottom: 20rpx;
-	}
+				.box {
+					width: 100%;
+					height: 22rpx;
+				}
 
-	.my-order .header .picTxt .pictrue {
-		width: 122rpx;
-		height: 109rpx;
-	}
+				.top {
+					margin-left: 26rpx;
+					display: flex;
+					justify-content: space-between;
 
-	.my-order .header .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
+					.shopName {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #000000;
+					}
 
-	.my-order .nav {
-		background-color: #fff;
-		width: 690rpx;
-		height: 140rpx;
-		border-radius: 14rpx;
-		margin: -60rpx auto 0 auto;
-	}
+					.state {
+						margin-right: 31rpx;
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #EF1E5F;
+					}
+				}
 
-	.my-order .nav .item {
-		text-align: center;
-		font-size: 26rpx;
-		color: #282828;
-		padding: 26rpx 0;
-	}
+				.content {
+					margin-top: 32rpx;
+					width: 100%;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					height: 110rpx;
 
-	.my-order .nav .item.on {
-		// font-weight: bold;
-		// border-bottom: 5rpx solid #e93323;
-		/* #ifdef H5 || MP */
-		font-weight: bold;
-		/* #endif */
-		border-bottom: 5rpx solid $theme-color;
-	}
+					.image {
+						margin-left: 35rpx;
+					}
 
-	.my-order .nav .item .num {
-		margin-top: 18rpx;
-	}
+					.text {
+						width: 420rpx;
+						height: 100%;
+						margin-right: 60rpx;
 
-	.my-order .list {
-		width: 690rpx;
-		margin: 14rpx auto 0 auto;
-	}
+						.name {
+							font-size: 26rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #000000;
+						}
 
-	.my-order .list .item {
-		background-color: #fff;
-		border-radius: 14rpx;
-		margin-bottom: 14rpx;
-	}
+						.model {
+							margin: 10rpx 0;
+							font-size: 24rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #B7B7B7;
+						}
 
-	.my-order .list .item .title {
-		height: 84rpx;
-		padding: 0 24rpx;
-		border-bottom: 1rpx solid #eee;
-		font-size: 28rpx;
-		color: #282828;
-	}
+						.price {
+							font-size: 26rpx;
+							font-family: PingFang SC;
+							font-weight: 400;
+							color: #E94343;
+						}
+					}
+				}
 
-	.my-order .list .item .title .sign {
-		font-size: 24rpx;
-		padding: 0 13rpx;
-		height: 36rpx;
-		margin-right: 15rpx;
-		border-radius: 18rpx;
-	}
+			}
+		}
 
-	.my-order .list .item .item-info {
-		padding: 0 24rpx;
-		margin-top: 22rpx;
-	}
 
-	.my-order .list .item .item-info .pictrue {
-		width: 120rpx;
-		height: 120rpx;
-	}
+		.search {
+			width: 523rpx;
+			height: 69rpx;
+			border: 1rpx solid #FE7596;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-radius: 27rpx;
 
-	.my-order .list .item .item-info .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 14rpx;
-	}
+			.icon {}
 
-	.my-order .list .item .item-info .text {
-		width: 500rpx;
-		font-size: 28rpx;
-		color: #999;
-	}
+			.button {
+				margin-right: 3rpx;
+				width: 82rpx;
+				height: 46rpx;
+				line-height: 45rpx;
+				text-align: center;
+				background: linear-gradient(0deg, #F02563 0%, #FE7596 100%);
+				border-radius: 22.5rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+		}
 
-	.my-order .list .item .item-info .text .name {
-		width: 350rpx;
-		color: #282828;
-	}
-
-	.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;
-		border-bottom: 1rpx solid #eee;
-	}
-
-	.my-order .list .item .totalPrice .money {
-		font-size: 28rpx;
-		font-weight: bold;
-	}
-
-	.my-order .list .item .bottom {
-		height: 107rpx;
-		padding: 0 30rpx;
-	}
-
-	.my-order .list .item .bottom .bnt {
-		width: 176rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		border-radius: 50rpx;
-		font-size: 27rpx;
-	}
-
-	.my-order .list .item .bottom .bnt.cancelBnt {
-		border: 1rpx solid #ddd;
-		color: #aaa;
-	}
-
-	.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%;
 	}
 </style>
diff --git a/yudao-ui-app/pages/users/order_list/index111.vue b/yudao-ui-app/pages/users/order_list/index111.vue
new file mode 100644
index 000000000..198d0c290
--- /dev/null
+++ b/yudao-ui-app/pages/users/order_list/index111.vue
@@ -0,0 +1,551 @@
+<template>
+	<view>
+		<view class='my-order'>
+			<view class='header bg-color'>
+				<view class='picTxt acea-row row-between-wrapper'>
+					<view class='text'>
+						<view class='name'>订单信息</view>
+						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{Number(orderData.sumPrice).toFixed(2) || 0}}</view>
+					</view>
+					<view class='pictrue'>
+						<image src='../../../static/images/orderTime.png'></image>
+					</view>
+				</view>
+			</view>
+			<view class='nav acea-row row-around'>
+				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
+					<view>待付款</view>
+					<view class='num'>{{orderData.unPaidCount || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
+					<view>待发货</view>
+					<view class='num'>{{orderData.unShippedCount || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+					<view>待收货</view>
+					<view class='num '>{{orderData.receivedCount || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
+					<view>待评价</view>
+					<view class='num'>{{orderData.evaluatedCount || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
+					<view>已完成</view>
+					<view class='num'>{{orderData.completeCount || 0}}</view>
+				</view>
+			</view>
+			<view class='list'>
+				<view class='item' v-for="(item,index) in orderList" :key="index">
+					<view @click='goOrderDetails(item.orderId)'>
+						<view class='title acea-row row-between-wrapper'>
+							<view class="acea-row row-middle">
+								<text class="sign cart-color acea-row row-center-wrapper" v-if="item.activityType !== '普通' && item.activityType !== '核销'">{{item.activityType}}</text>
+								<!-- <text class="sign cart-color acea-row row-center-wrapper" v-if="item.bargainId != 0">砍价</text>
+								<text class="sign cart-color acea-row row-center-wrapper" v-else-if="item.storeOrder.combinationId != 0">拼团</text>
+								<text class="sign cart-color acea-row row-center-wrapper" v-else-if="item.storeOrder.seckillId != 0">秒杀</text> -->
+								<view>{{item.createTime}}</view>
+							</view>
+							<view class='font-color'>{{item.orderStatus}}</view>
+							<!-- <view v-if="item.status?item.status.type == 0:0" class='font-color'>待付款</view>
+							<view v-else-if="item.status?item.status.type == 1:0 && item.storeOrder.shippingType==1" class='font-color'>待发货</view>
+							<view v-else-if="item.status?item.status.type == 2:0 && item.storeOrder.shippingType==1" class='font-color'>待收货</view>
+							<view v-else-if="item.status?item.status.type == 3:0 && item.storeOrder.shippingType==1" class='font-color'>待评价</view>
+							<view v-else-if="item.status?item.status.type == 4:0 && item.storeOrder.shippingType==1" class='font-color'>已完成</view>
+							<view v-else-if="item.storeOrder.shippingType==2" class='font-color'>待核销</view> -->
+						</view>
+						<view class='item-info acea-row row-between row-top' v-for="(items,index) in item.orderInfoList" :key="index">
+							<view class='pictrue'>
+								<image :src='items.image'></image>
+							</view>
+							<view class='text acea-row row-between'>
+								<view class='name line2'>{{items.storeName}}</view>
+								<view class='money'>
+									<view>￥{{items.price}}</view>
+									<view>x{{items.cartNum}}</view>
+								</view>
+							</view>
+						</view>
+						<view class='totalPrice'>共{{item.totalNum}}件商品，总金额
+							<text class='money font-color'>￥{{item.payPrice}}</text>
+						</view>
+					</view>
+					<view class='bottom acea-row row-right row-middle'>
+						<view class='bnt cancelBnt' v-if="!item.paid" @click='cancelOrder(index,item.id)'>取消订单</view>
+						<view class='bnt bg-color' v-if="!item.paid" @click='goPay(item.payPrice,item.orderId)'>立即付款</view>
+						<view class='bnt bg-color' v-else-if="item.status== 0 || item.status== 1 || item.status== 3" @click='goOrderDetails(item.orderId)'>查看详情</view>
+						<view class='bnt bg-color' v-else-if="item.status==2" @click='goOrderDetails(item.orderId)'>去评价</view>
+						<view class='bnt cancelBnt' v-if="item.status == 3" @click='delOrder(item.id,index)'>删除订单</view>
+					</view>
+					<!-- <view class='bottom acea-row row-right row-middle'>
+						<view class='bnt cancelBnt' v-if="item.status?item.status.type==0:0 || item.status?item.status.type == 9:0" @click='cancelOrder(index,item.id)'>取消订单</view>
+						<view class='bnt bg-color' v-if="item.status?item.status.type == 0:0" @click='goPay(item.payPrice,item.orderId)'>立即付款</view>
+						<view class='bnt bg-color' v-else-if="item.status?item.status.type == 1:0 || item.status?item.status.type == 9:0" @click='goOrderDetails(item.orderId)'>查看详情</view>
+						<view class='bnt bg-color' v-else-if="item.status?item.status.type == 2:0 && item.status.deliveryType" @click='goOrderDetails(item.orderId)'>查看详情</view>
+						<view class='bnt bg-color' v-else-if="item.status?item.status.type == 3:0" @click='goOrderDetails(item.orderId)'>去评价</view>
+						<view class='bnt bg-color' v-else-if="item.storeOrder.seckillId < 1 && item.storeOrder.bargainId < 1 && item.storeOrder.combinationId < 1 && item.status?item.status.type == 4:0"
+						 @click='goOrderDetails(item.orderId)'>再次购买</view>
+						<view class='bnt cancelBnt' v-if="item.status?item.status.type == 4:0" @click='delOrder(item.id,index)'>删除订单</view>
+					</view> -->
+				</view>
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>0">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+			<view v-if="orderList.length == 0">
+				<emptyPage title="暂无订单~"></emptyPage>
+			</view>
+		</view>
+		<view class='noCart' v-if="orderList.length == 0 && page > 1">
+			<view class='pictrue'>
+				<image src='/images/noOrder.png'></image>
+			</view>
+		</view>
+		<!-- #ifdef MP -->
+		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
+		<!-- #endif -->
+		<home></home>
+		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderList,
+		orderData,
+		orderCancel,
+		orderDel
+	} from '@/api/order.js';
+	import {
+		openOrderSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import home from '@/components/home';
+	import payment from '@/components/payment';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	// #ifdef MP
+	import authorize from '@/components/Authorize';
+	// #endif
+	import emptyPage from '@/components/emptyPage.vue'
+	export default {
+		components: {
+			payment,
+			home,
+			emptyPage,
+			// #ifdef MP
+			authorize
+			// #endif
+		},
+		data() {
+			return {
+				loading: false, //是否加载中
+				loadend: false, //是否加载完毕
+				loadTitle: '加载更多', //提示语
+				orderList: [], //订单数组
+				orderData: {}, //订单详细统计
+				orderStatus: 0, //订单状态
+				page: 1,
+				limit: 20,
+				payMode: [{
+						name: "微信支付",
+						icon: "icon-weixinzhifu",
+						value: 'weixin',
+						title: '微信快捷支付'
+					},
+					{
+						name: "余额支付",
+						icon: "icon-yuezhifu",
+						value: 'yue',
+						title: '可用余额:',
+						number: 0
+					}
+				],
+				pay_close: false,
+				pay_order_id: '',
+				totalPrice: '0',
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false //是否隐藏授权
+			};
+		},
+		computed: mapGetters(['isLogin', 'userInfo']),
+		onShow() {
+			if (this.isLogin) {
+				this.loadend = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.getOrderData();
+				this.getOrderList();
+				this.payMode[1].number = this.userInfo.nowMoney;
+				this.$set(this, 'payMode', this.payMode);
+			} 
+			else {
+				// toLogin();
+			}
+		},
+		methods: {
+			onLoadFun() {
+				this.getOrderData();
+				this.getOrderList();
+			},
+			// 授权关闭
+			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);
+			},
+			/**
+			 * 关闭支付组件
+			 * 
+			 */
+			payClose: function() {
+				this.pay_close = false;
+			},
+			/**
+			 * 生命周期函数--监听页面加载
+			 */
+			onLoad: function(options) {
+				if (options.status) this.orderStatus = options.status;
+			},
+			/**
+			 * 获取订单统计数据
+			 * 
+			 */
+			getOrderData: function() {
+				let that = this;
+				orderData().then(res => {
+					that.$set(that, 'orderData', res.data);
+				})
+			},
+			/**
+			 * 取消订单
+			 * 
+			 */
+			cancelOrder: function(index, order_id) {
+				let that = this;
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法取消订单'
+				});
+				uni.showLoading({
+				    title: '正在删除中'
+				});
+				orderCancel(order_id).then(res => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: '删除成功',
+						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(pay_price, order_id) {
+				this.$set(this, 'pay_close', true);
+				this.$set(this, 'pay_order_id', order_id);
+				this.$set(this, 'totalPrice', pay_price);
+			},
+			/**
+			 * 支付成功回调
+			 * 
+			 */
+			pay_complete: function() {
+				this.loadend = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.$set(this, 'pay_close', false);
+				this.getOrderData();
+				this.getOrderList();
+			},
+			/**
+			 * 支付失败回调
+			 * 
+			 */
+			pay_fail: function() {
+				this.pay_close = false;
+			},
+			/**
+			 * 去订单详情
+			 */
+			goOrderDetails: function(order_id) {
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法查看订单详情'
+				});
+				// #ifdef MP
+				uni.showLoading({
+					title: '正在加载',
+				})
+				openOrderSubscribe().then(() => {
+					uni.hideLoading();
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}).catch(() => {
+					uni.hideLoading();
+				})
+				// #endif  
+				// #ifndef MP
+				uni.navigateTo({
+					url: '/pages/order_details/index?order_id=' + order_id
+				})
+				// #endif
+			},
+			/**
+			 * 切换类型
+			 */
+			statusClick: function(status) {
+				if (status == this.orderStatus) return;
+				this.orderStatus = status;
+				this.loadend = 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 = "加载更多";
+				getOrderList({
+					type: that.orderStatus,
+					page: that.page,
+					limit: that.limit,
+				}).then(res => {
+					let list = res.data.list || [];
+					let loadend = list.length < that.limit;
+					that.orderList = that.$util.SplitArray(list, that.orderList);
+					that.$set(that, 'orderList', that.orderList);
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+					that.page = that.page + 1;
+				}).catch(err => {
+					that.loading = false;
+					that.loadTitle = "加载更多";
+				})
+			},
+
+			/**
+			 * 删除订单
+			 */
+			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
+					});
+				})
+			},
+		},
+		onReachBottom: function() {
+			this.getOrderList();
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.my-order .header {
+		height: 250rpx;
+		padding: 0 30rpx;
+	}
+
+	.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: 14rpx;
+		margin: -60rpx auto 0 auto;
+	}
+
+	.my-order .nav .item {
+		text-align: center;
+		font-size: 26rpx;
+		color: #282828;
+		padding: 26rpx 0;
+	}
+
+	.my-order .nav .item.on {
+		// font-weight: bold;
+		// border-bottom: 5rpx solid #e93323;
+		/* #ifdef H5 || MP */
+		font-weight: bold;
+		/* #endif */
+		border-bottom: 5rpx solid $theme-color;
+	}
+
+	.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: 14rpx;
+		margin-bottom: 14rpx;
+	}
+
+	.my-order .list .item .title {
+		height: 84rpx;
+		padding: 0 24rpx;
+		border-bottom: 1rpx solid #eee;
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.my-order .list .item .title .sign {
+		font-size: 24rpx;
+		padding: 0 13rpx;
+		height: 36rpx;
+		margin-right: 15rpx;
+		border-radius: 18rpx;
+	}
+
+	.my-order .list .item .item-info {
+		padding: 0 24rpx;
+		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: 14rpx;
+	}
+
+	.my-order .list .item .item-info .text {
+		width: 500rpx;
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	.my-order .list .item .item-info .text .name {
+		width: 350rpx;
+		color: #282828;
+	}
+
+	.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;
+		border-bottom: 1rpx solid #eee;
+	}
+
+	.my-order .list .item .totalPrice .money {
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+
+	.my-order .list .item .bottom {
+		height: 107rpx;
+		padding: 0 30rpx;
+	}
+
+	.my-order .list .item .bottom .bnt {
+		width: 176rpx;
+		height: 60rpx;
+		text-align: center;
+		line-height: 60rpx;
+		color: #fff;
+		border-radius: 50rpx;
+		font-size: 27rpx;
+	}
+
+	.my-order .list .item .bottom .bnt.cancelBnt {
+		border: 1rpx solid #ddd;
+		color: #aaa;
+	}
+
+	.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%;
+	}
+</style>
diff --git a/yudao-ui-app/project.config.json b/yudao-ui-app/project.config.json
new file mode 100644
index 000000000..3c6fd75fe
--- /dev/null
+++ b/yudao-ui-app/project.config.json
@@ -0,0 +1,28 @@
+{
+  "appid": "wx51c5e9eb4ec5cce7",
+  "compileType": "miniprogram",
+  "libVersion": "2.32.0",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}
\ No newline at end of file
diff --git a/yudao-ui-app/project.private.config.json b/yudao-ui-app/project.private.config.json
new file mode 100644
index 000000000..d7b40e625
--- /dev/null
+++ b/yudao-ui-app/project.private.config.json
@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "yudao-ui-app",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}
\ No newline at end of file
diff --git a/yudao-ui-app/static/images/shop/bag.png b/yudao-ui-app/static/images/shop/bag.png
new file mode 100644
index 000000000..9accdc2e4
Binary files /dev/null and b/yudao-ui-app/static/images/shop/bag.png differ
diff --git a/yudao-ui-app/static/images/shop/car.png b/yudao-ui-app/static/images/shop/car.png
new file mode 100644
index 000000000..1c916c9dc
Binary files /dev/null and b/yudao-ui-app/static/images/shop/car.png differ
diff --git a/yudao-ui-app/static/images/shop/cart_bg.png b/yudao-ui-app/static/images/shop/cart_bg.png
new file mode 100644
index 000000000..fd765496c
Binary files /dev/null and b/yudao-ui-app/static/images/shop/cart_bg.png differ
diff --git a/yudao-ui-app/static/images/shop/checked.png b/yudao-ui-app/static/images/shop/checked.png
new file mode 100644
index 000000000..c2b7565cd
Binary files /dev/null and b/yudao-ui-app/static/images/shop/checked.png differ
diff --git a/yudao-ui-app/static/images/shop/cloth.png b/yudao-ui-app/static/images/shop/cloth.png
new file mode 100644
index 000000000..2b31ad2c0
Binary files /dev/null and b/yudao-ui-app/static/images/shop/cloth.png differ
diff --git a/yudao-ui-app/static/images/shop/go.png b/yudao-ui-app/static/images/shop/go.png
new file mode 100644
index 000000000..34c486e38
Binary files /dev/null and b/yudao-ui-app/static/images/shop/go.png differ
diff --git a/yudao-ui-app/static/images/shop/index_cart.png b/yudao-ui-app/static/images/shop/index_cart.png
new file mode 100644
index 000000000..9c8d4859e
Binary files /dev/null and b/yudao-ui-app/static/images/shop/index_cart.png differ
diff --git a/yudao-ui-app/static/images/shop/index_hbottom.png b/yudao-ui-app/static/images/shop/index_hbottom.png
new file mode 100644
index 000000000..8a46b670c
Binary files /dev/null and b/yudao-ui-app/static/images/shop/index_hbottom.png differ
diff --git a/yudao-ui-app/static/images/shop/index_headerbg.png b/yudao-ui-app/static/images/shop/index_headerbg.png
new file mode 100644
index 000000000..a01774faf
Binary files /dev/null and b/yudao-ui-app/static/images/shop/index_headerbg.png differ
diff --git a/yudao-ui-app/static/images/shop/index_hot.png b/yudao-ui-app/static/images/shop/index_hot.png
new file mode 100644
index 000000000..6b4dd866e
Binary files /dev/null and b/yudao-ui-app/static/images/shop/index_hot.png differ
diff --git a/yudao-ui-app/static/images/shop/index_search.png b/yudao-ui-app/static/images/shop/index_search.png
new file mode 100644
index 000000000..5153c7187
Binary files /dev/null and b/yudao-ui-app/static/images/shop/index_search.png differ
diff --git a/yudao-ui-app/static/images/shop/navigation.png b/yudao-ui-app/static/images/shop/navigation.png
new file mode 100644
index 000000000..3af0d7fd0
Binary files /dev/null and b/yudao-ui-app/static/images/shop/navigation.png differ
diff --git a/yudao-ui-app/static/images/shop/nochecked.png b/yudao-ui-app/static/images/shop/nochecked.png
new file mode 100644
index 000000000..ffbb95cb4
Binary files /dev/null and b/yudao-ui-app/static/images/shop/nochecked.png differ
diff --git a/yudao-ui-app/static/images/shop/shoes.png b/yudao-ui-app/static/images/shop/shoes.png
new file mode 100644
index 000000000..508eb8da4
Binary files /dev/null and b/yudao-ui-app/static/images/shop/shoes.png differ
diff --git a/yudao-ui-app/static/images/shop/wechat.png b/yudao-ui-app/static/images/shop/wechat.png
new file mode 100644
index 000000000..4fbd223e5
Binary files /dev/null and b/yudao-ui-app/static/images/shop/wechat.png differ
diff --git a/yudao-ui-app/static/images/shop/zfb.png b/yudao-ui-app/static/images/shop/zfb.png
new file mode 100644
index 000000000..f84f3d4eb
Binary files /dev/null and b/yudao-ui-app/static/images/shop/zfb.png differ