From 44f7662fc0c1fd5604cb285200d12fd7da94f67b Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Tue, 12 Sep 2023 12:43:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 858 +++-- androidPrivacy.json | 46 +- api/admin.js | 143 +- api/api.js | 22 + api/community.js | 5 + api/order.js | 16 +- api/product.js | 12 + api/public.js | 1 + api/store.js | 357 +- api/user.js | 12 + .../WaterfallsFlowItem/WaterfallsFlowItem.vue | 2 +- components/addressWindow/index.vue | 2 +- components/areaWindow/index.vue | 105 +- components/checkDelivery/index.vue | 107 +- components/orderGoods/index.vue | 309 +- components/payment/index.vue | 151 +- components/plantConSwiper/index.vue | 2 +- components/productWindow/index.vue | 31 +- components/zbpSwiper.vue | 581 +-- config/app.js | 98 +- config/cache.js | 2 + main.js | 81 +- manifest.json | 27 +- pages.json | 2992 +++++++++------- pages/activity/combination_details/index.vue | 1969 ---------- pages/activity/lifeService/index.vue | 1 + pages/admin/order/index.vue | 863 +++-- pages/admin/orderDetail/index.vue | 80 +- pages/admin/orderList/index.vue | 1864 +++++----- pages/chat/customer_list/chat.vue | 2 + pages/columnGoods/goods_search/index.vue | 6 +- pages/columnGoods/goods_search_con/index.vue | 40 +- pages/gather/gather.vue | 643 ++-- pages/goods_details/index.vue | 4 +- pages/home/index.vue | 663 ++-- pages/index/component/pictureCube.vue | 2 +- pages/index/index.vue | 1467 ++++++-- pages/news_details/index.vue | 565 +-- pages/news_list/index.vue | 621 ++-- pages/nongKe/cloud_entrepot/index.vue | 1130 +++++- pages/nongKe/gather/select_warehouse.vue | 1447 ++++---- pages/nongKe/goods_list/index.vue | 2001 +++++------ .../supply_chain/component/shop_card.vue | 4 +- pages/nongKe/supply_chain/goods_list.vue | 626 ++-- pages/nongKe/supply_chain/merchant.vue | 259 +- .../nongKe/supply_chain/shopping_trolley.vue | 13 +- pages/nongKe/supply_chain/supplier-copy.vue | 2 +- pages/nongKe/supply_chain/supplier.vue | 383 +- pages/order_addcart/order_addcart.vue | 300 +- pages/order_details/index.vue | 713 +++- pages/order_details/stay.vue | 1377 ++++--- pages/order_pay_status/index.vue | 188 +- pages/plantGrass/plant_detail/index.vue | 1140 +++--- pages/plantGrass/plant_release/index.vue | 21 +- pages/plantGrass/plant_user/index.vue | 3 +- pages/plant_release/index.vue | 1839 +++++----- pages/product/addGoods/index.vue | 10 +- pages/product/addGoods/modifyPrice.vue | 14 - pages/product/addGoods/secound.vue | 117 +- .../product/addGoods/singleSpecification.vue | 8 - pages/product/basicSet.vue | 1225 ++++--- pages/product/list/index.vue | 1416 +++++--- pages/short_video/appSwiper/index.nvue | 3170 +++++++++-------- pages/short_video/nvueSwiper/index.nvue | 164 +- pages/store/applicationRecord/index.vue | 2 +- pages/store/home/index.vue | 7 +- pages/store/list/index.vue | 2 + pages/store/merchantDetails/index.vue | 197 +- pages/store/settled/index.vue | 6 +- pages/supply_chains/supply_chains.vue | 1372 ++++--- pages/user/index.vue | 2477 ++++++------- pages/users/embody/embody.vue | 19 +- pages/users/gather_list/index.vue | 26 +- pages/users/login/login_copy.vue | 52 +- pages/users/order_confirm/index.vue | 300 +- pages/users/order_list/index.vue | 2050 ++++++----- pages/users/order_list/search.vue | 31 +- pages/users/refund/list.vue | 257 +- pages/users/user_address/index.vue | 171 +- pages/users/user_money/index.vue | 6 +- pages/users/user_setting/index.vue | 1 + static/css/base.css | 2 +- static/css/style.scss | 474 ++- static/tabbar_icon/a-a.png | Bin 2164 -> 4650 bytes static/tabbar_icon/a.png | Bin 1744 -> 1446 bytes static/tabbar_icon/b-a.png | Bin 1104 -> 4771 bytes static/tabbar_icon/b.png | Bin 827 -> 2656 bytes static/tabbar_icon/c-a.png | Bin 2385 -> 4873 bytes static/tabbar_icon/c.png | Bin 2016 -> 1625 bytes static/tabbar_icon/d-a.png | Bin 1461 -> 3750 bytes static/tabbar_icon/d.png | Bin 1371 -> 2193 bytes static/tabbar_icon/e-a.png | Bin 2320 -> 4903 bytes static/tabbar_icon/e.png | Bin 1969 -> 2267 bytes store/modules/app.js | 259 +- uni.scss | 42 +- .../uview-ui/libs/config/props/noNetwork.js | 14 +- 96 files changed, 22564 insertions(+), 17525 deletions(-) diff --git a/App.vue b/App.vue index 22bb76c..951f3f5 100644 --- a/App.vue +++ b/App.vue @@ -1,371 +1,527 @@ \ No newline at end of file diff --git a/androidPrivacy.json b/androidPrivacy.json index f5851af..2b50d59 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -1,27 +1,27 @@ { - "version": "1", - "prompt": "template", - "title": "服务协议和隐私政策", - "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", - "buttonAccept": "同意并接受", - "buttonRefuse": "暂不同意", - "second": { - "title": "确认提示", - "message": "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", - "buttonAccept": "同意并继续", - "buttonRefuse": "退出应用" - }, - "styles": { - "backgroundColor": "#fff", - "borderRadius":"5px", - "title": { - "color": "#000" + "version" : "1", + "prompt" : "template", + "title" : "服务协议与隐私政策", + "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志、OAID等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\t你可以阅读 《用户协议》 与 《隐私政策》了解详细信息。如你同意，请点击“我同意”开始接受我们的服务。", + "buttonAccept" : "同意并接受", + "buttonRefuse" : "暂不同意", + "second" : { + "title" : "确认提示", + "message" : "进入应用前，你需先同意《用户协议》 与 《隐私政策》，否则将退出应用。", + "buttonAccept" : "同意并继续", + "buttonRefuse" : "退出应用" }, - "buttonAccept": { - "color": "#fff" - }, - "buttonRefuse": { - "color": "#ccc" + "styles" : { + "backgroundColor" : "#fff", + "borderRadius" : "5px", + "title" : { + "color" : "#000" + }, + "buttonAccept" : { + "color" : "#fff" + }, + "buttonRefuse" : { + "color" : "#ccc" + } } - } } diff --git a/api/admin.js b/api/admin.js index ee0a969..c94d3bc 100644 --- a/api/admin.js +++ b/api/admin.js @@ -13,68 +13,107 @@ import request from "@/utils/request.js"; * 统计数据 */ export function getStatisticsInfo() { - return request.get("admin/order/statistics", {}, { login: true }); + return request.get("admin/order/statistics", {}, { + login: true + }); } + /** * 订单月统计 */ export function getStatisticsMonth(where) { - return request.get("admin/order/data", where, { login: true }); + return request.get("admin/order/data", where, { + login: true + }); } /** * 订单月统计 */ export function getAdminOrderList(where) { - return request.get("admin/order/list", where, { login: true }); + return request.get("admin/order/list", where, { + login: true + }); } /** * 订单改价 */ export function setAdminOrderPrice(merId, id, data) { - return request.post("admin/" + merId + "/price/" + id, data, { login: true }); + return request.post("admin/" + merId + "/price/" + id, data, { + login: true + }); +} +/** + * 同意先货后款 + */ +export function postconfirm(merId, data) { + return request.post("admin/" + merId + "/confirm", data, { + login: true + }); +} +/** + * 先货后款订单结算 + */ +export function postsettle(merId, data) { + return request.post("admin/" + merId + "/settle", data, { + login: true + }); } /** * 订单备注 */ export function setAdminOrderRemark(merId, id, data) { - return request.post("admin/" + merId + "/mark/" + id, data, { login: true }); + return request.post("admin/" + merId + "/mark/" + id, data, { + login: true + }); } /** * 订单详情 */ export function getAdminOrderDetail(merId, orderId) { - return request.get("admin/" + merId + "/order/" + orderId, {}, { login: true }); + return request.get("admin/" + merId + "/order/" + orderId, {}, { + login: true + }); } /** * 订单发货信息获取 */ export function getAdminOrderDelivery(orderId) { - return request.get("admin/order/delivery/gain/" + orderId, {}, { login: true }); + return request.get("admin/order/delivery/gain/" + orderId, {}, { + login: true + }); } /** * 订单发货保存 */ export function setAdminOrderDelivery(merId, id, data) { - return request.post("admin/" + merId + "/delivery/" + id, data, { login: true }); + return request.post("admin/" + merId + "/delivery/" + id, data, { + login: true + }); } /** * 订单统计图 */ export function getStatisticsTime(data) { - return request.get("admin/order/time", data, { login: true }); + return request.get("admin/order/time", data, { + login: true + }); } /** * 线下付款订单确认付款 */ export function setOfflinePay(merId, data) { - return request.post("admin/" + merId + "/order/offline", data, { login: true }); + return request.post("admin/" + merId + "/order/offline", data, { + login: true + }); } /** * 订单确认退款 */ export function setOrderRefund(merId, data) { - return request.post("admin/" + merId + "/order/refund", data, { login: true }); + return request.post("admin/" + merId + "/order/refund", data, { + login: true + }); } /** @@ -82,7 +121,9 @@ export function setOrderRefund(merId, data) { * @returns {*} */ export function getLogistics() { - return request.get("logistics", {}, { login: false }); + return request.get("logistics", {}, { + login: false + }); } /** @@ -90,7 +131,7 @@ export function getLogistics() { * @returns {*} */ export function orderVerific(merId, id, data) { - return request.post(`verifier/${merId}/${id}`, data); + return request.post(`verifier/${merId}/${id}`, data); } /** @@ -98,7 +139,7 @@ export function orderVerific(merId, id, data) { * @returns {*} */ export function verifierOrder(mer_id, code) { - return request.get("verifier/" + mer_id + "/order/" + code); + return request.get("verifier/" + mer_id + "/order/" + code); } /** @@ -106,108 +147,150 @@ export function verifierOrder(mer_id, code) { * @returns {*} */ export function orderStatistics(mer_id, data) { - return request.get("admin/" + mer_id + "/statistics", data); + return request.get("admin/" + mer_id + "/statistics", data); +} +/** + * 订单 + * @returns {*} + */ +export function orderStat(data) { + return request.get("admin/1/statistics", data); } /** * 每日成交额 * @returns {*} */ export function orderPrice(where, mer_id) { - return request.get("admin/" + mer_id + "/order_price", where, { login: true }); + return request.get("admin/" + mer_id + "/order_price", where, { + login: true + }); } /** * 订单列表 * @returns {*} */ export function getOrderList(where, merId) { - return request.get(`admin/${merId}/order_list`, where, { login: true }); + return request.get(`admin/${merId}/order_list`, where, { + login: true + }); } /** * 退款订单列表 * @returns {*} */ export function getRefundOrderList(where, merId) { - return request.get(`server/${merId}/refund/lst`, where, { login: true }); + return request.get(`server/${merId}/refund/lst`, where, { + login: true + }); } /** * 营业额统计 * @returns {*} */ export function turnoverStatistics(where, merId) { - return request.get(`admin/${merId}/pay_price`, where, { login: true }); + return request.get(`admin/${merId}/pay_price`, where, { + login: true + }); } /** * 订单统计 * @returns {*} */ export function orderNumberStatistics(where, merId) { - return request.get(`admin/${merId}/pay_number`, where, { login: true }); + return request.get(`admin/${merId}/pay_number`, where, { + login: true + }); } /** * 获取订单打印默认配置 * @returns {*} */ export function orderDeliveryInfo(merId) { - return request.get(`admin/${merId}/mer_form`); + return request.get(`admin/${merId}/mer_form`); } /** * 获取电子面单列表 * @returns {*} */ export function orderExportTemp(data) { - return request.get("store/expr/temps", data); + return request.get("store/expr/temps", data); } /** * 是否开始电子面单和同城配送 * @returns {*} */ export function getTempAndDelivery(merId) { - return request.get(`admin/${merId}/delivery_config`); + return request.get(`admin/${merId}/delivery_config`); } /** * 获取同城配送门店列表 * @returns {*} */ export function getDeliveryStoreLst(merId) { - return request.get(`admin/${merId}/delivery_options`); + return request.get(`admin/${merId}/delivery_options`); } /** * 退款订单信息 * @returns {*} */ export function getRefundOrderInfo(merId, id) { - return request.get(`server/${merId}/refund/get/${id}`); + return request.get(`server/${merId}/refund/get/${id}`); } /** * 提交退款订单信息 * @returns {*} */ export function refundOrderSubmit(merId, id, data) { - return request.post(`server/${merId}/refund/status/${id}`, data, { login: true }); + return request.post(`server/${merId}/refund/status/${id}`, data, { + login: true + }); } /** * 退款单确认收货 * @returns {*} */ export function refundOrderReceive(merId, id) { - return request.post(`server/${merId}/refund/confirm/${id}`, {}, { login: true }); + return request.post(`server/${merId}/refund/confirm/${id}`, {}, { + login: true + }); } /** * 退款单详情 */ export function getRefundOrderDetail(merId, orderId) { - return request.get(`server/${merId}/refund/detail/${orderId}`, {}, { login: true }); + return request.get(`server/${merId}/refund/detail/${orderId}`, {}, { + login: true + }); } /** * 添加退款单备注信息 */ export function setRefundMark(merId, orderId, data) { - return request.post(`server/${merId}/refund/mark/${orderId}`, data, { login: true }); + return request.post(`server/${merId}/refund/mark/${orderId}`, data, { + login: true + }); } /** * 去核销 * @param object data */ export function orderCancellation(merId, id) { - return request.post(`admin/${merId}/verify/${id}`); + return request.post(`admin/${merId}/verify/${id}`); +} +/** + * 去核销 + * @param object data + */ +export function purchaseOrder(where, merId) { + return request.get(`admin/${merId}/purchaseOrder`, where, { + login: true + }); +} + +/** + * 商家物流取件二维码 + * @param object data + */ +export function logisticsCode(id) { + return request.get(`order/logistics_code/${id}`); } \ No newline at end of file diff --git a/api/api.js b/api/api.js index 3daf575..6877e42 100644 --- a/api/api.js +++ b/api/api.js @@ -103,6 +103,10 @@ export function getUserCoupons(data) { export function getArticleCategoryList() { return request.get('article/category/lst', {}, { noAuth: true }) } + +export function getArticleCategoryLists() { + return request.get('article/category/lst?is_home='+1, {}, { noAuth: true }) +} /** * 文章列表 * @param int cid @@ -268,4 +272,22 @@ export function ajcaptchaCheck(data) { return request.post("ajcheck", data, { noAuth: true }); +} + + + +/** + * 获取所在的地区数据 + * @param {Object} data + */ +export function village(data) { + return request.get('v2/system/geo/lst', data, { noAuth: true }); +} + +/** + * 获取所在的村队数据 + * @param {Object} data + */ +export function brigade(data) { + return request.get('v2/system/brigade', data, { noAuth: true }); } \ No newline at end of file diff --git a/api/community.js b/api/community.js index 53e01e5..fe9ec77 100644 --- a/api/community.js +++ b/api/community.js @@ -82,11 +82,16 @@ export function videoList(data) { }); } /**自己的视频列表*/ +export function deoList(id) { + return request.get(`community/show/${id}`); +} + export function myVideoList(id,data) { return request.get(`community/user/community_video/${id}`, data, { noAuth: true }); } + /**文章点赞*/ export function graphicStartApi(id, status) { return request.post(`community/start/${id}`, status); diff --git a/api/order.js b/api/order.js index dc62d9e..8cc746e 100644 --- a/api/order.js +++ b/api/order.js @@ -107,7 +107,7 @@ export function orderDel(id) { } /** - * 订单详情 + * 已付款订单详情 * @param string uni */ export function getOrderDetail(uni) { @@ -115,11 +115,11 @@ export function getOrderDetail(uni) { } /** - * 订单详情 + * 未付款订单详情 * @param string uni */ -export function groupOrderDetail(uni) { - return request.get('order/group_order_detail/' + uni); +export function groupOrderDetail(uni,product_type) { + return request.get('order/group_order_detail/' + uni+'?product_type=' + product_type); } // 支付状态订单 @@ -326,4 +326,12 @@ export function applyInvoiceApi(id, data) { */ export function refundCancelApi(id) { return request.post(`refund/cancel/${id}`); +} + +/** + * 售后 + * @param object data + */ +export function refundlist(data) { + return request.get(`refund/list`,data); } \ No newline at end of file diff --git a/api/product.js b/api/product.js index b820836..547c66e 100644 --- a/api/product.js +++ b/api/product.js @@ -14,6 +14,18 @@ import request from "@/utils/request.js"; */ export const getProductDetailsAPI = (data) => request.get('micro/product_details', data) +/** + *商品列表 + */ +export const spuInfo = (id,data) => request.get('product/spu/street/'+id, data) + + +/** + * 线下导入 + */ +export function postImport(merid,data) { + return request.post(`server/${merid}/product/stockIn`, data); +} /** * 获取商户基本信息 http://127.0.0.1:8324/api/store/merchant/info?id=4 */ diff --git a/api/public.js b/api/public.js index 250bb47..723b7d3 100644 --- a/api/public.js +++ b/api/public.js @@ -24,6 +24,7 @@ export function getWechatConfig() { ); } + /** * 获取微信sdk配置 * @returns {*} diff --git a/api/store.js b/api/store.js index 1ef4e99..1b566c2 100644 --- a/api/store.js +++ b/api/store.js @@ -5,14 +5,14 @@ import request from "@/utils/request.js"; * */ export function microSeachBarCode(data) { - return request.get('micro/seach_bar_code', data); + return request.get('micro/seach_bar_code', data); } /** * 获取收款二维码 * @returns {*} */ export function createtApi(data) { - return request.post('v2/micropay/create', data); + return request.post('v2/micropay/create', data); } /** @@ -20,7 +20,7 @@ export function createtApi(data) { * @returns {*} */ export function addCartApi(data) { - return request.post('v2/micropay/addCart', data); + return request.post('v2/micropay/addCart', data); } /** * 获取产品详情 @@ -28,9 +28,9 @@ export function addCartApi(data) { * */ export function getProductDetail(id, data) { - return request.get('store/product/detail/' + id, data, { - noAuth: true - }); + return request.get('store/product/detail/' + id, data, { + noAuth: true + }); } /** * 获取预览商品详情 @@ -38,16 +38,16 @@ export function getProductDetail(id, data) { * */ export function getPreviewProDetail(data) { - return request.get('store/product/preview', data, { - noAuth: true - }); + return request.get('store/product/preview', data, { + noAuth: true + }); } /** * 产品分享二维码 推广员 * @param int id */ export function getProductCode(id, data) { - return request.get('store/product/qrcode/' + id, data); + return request.get('store/product/qrcode/' + id, data); } /** * 添加收藏 @@ -55,7 +55,7 @@ export function getProductCode(id, data) { * @param string category product=普通产品,product_seckill=秒杀产品 */ export function collectAdd(data) { - return request.post('user/relation/create', data); + return request.post('user/relation/create', data); } /** * 删除收藏产品 @@ -63,14 +63,14 @@ export function collectAdd(data) { * @param string category product=普通产品,product_seckill=秒杀产品 */ export function collectDel(data) { - return request.post('user/relation/delete', data); + return request.post('user/relation/delete', data); } /** * 购车添加 * */ export function postCartAdd(data) { - return request.post('user/cart/create', data); + return request.post('user/cart/create', data); } /** @@ -78,73 +78,73 @@ export function postCartAdd(data) { * */ export function getCategoryList() { - return request.get('store/product/category/lst', {}, { - noAuth: true - }); + return request.get('store/product/category/lst', {}, { + noAuth: true + }); } /** * 获取产品列表 * @param object data */ export function getProductslist(data) { - if (data.brand_id && Array.isArray(data.brand_id)) { - data = { - ...data - } - data.brand_id = data.brand_id.toString() - } - return request.get('product/spu/lst', data, { - noAuth: true - }); + if (data.brand_id && Array.isArray(data.brand_id)) { + data = { + ...data + } + data.brand_id = data.brand_id.toString() + } + return request.get('product/spu/lst', data, { + noAuth: true + }); } /** * 获取优惠券商品列表 * @param object data */ export function getCouponProductlist(data) { - if (data.brand_id && Array.isArray(data.brand_id)) { - data = { - ...data - } - data.brand_id = data.brand_id.toString() - } - return request.get('product/spu/coupon_product', data, { - noAuth: true - }); + if (data.brand_id && Array.isArray(data.brand_id)) { + data = { + ...data + } + data.brand_id = data.brand_id.toString() + } + return request.get('product/spu/coupon_product', data, { + noAuth: true + }); } /** * 获取品牌列表 * @param object data */ export function getBrandlist(data) { - return request.get('store/product/brand/lst', data, { - noAuth: true - }); + return request.get('store/product/brand/lst', data, { + noAuth: true + }); } /** * 获取推荐产品 * */ export function getProductHot(page, limit) { - return request.get("product/spu/recommend", { - page: page === undefined ? 1 : page, - limit: limit === undefined ? 10 : limit - }, { - noAuth: true - }); + return request.get("product/spu/recommend", { + page: page === undefined ? 1 : page, + limit: limit === undefined ? 10 : limit + }, { + noAuth: true + }); } /** * 获取商户推荐产品 * */ export function getMerProductHot(id, data) { - return request.get(`product/spu/recommend`, { - page: data.page === undefined ? 1 : data.page, - limit: data.limit === undefined ? 10 : data.limit, - mer_id: id || '' - }, { - noAuth: true - }); + return request.get(`product/spu/recommend`, { + page: data.page === undefined ? 1 : data.page, + limit: data.limit === undefined ? 10 : data.limit, + mer_id: id || '' + }, { + noAuth: true + }); } /** * 批量收藏 @@ -153,7 +153,7 @@ export function getMerProductHot(id, data) { * @param string category */ export function collectAll(data) { - return request.post('user/relation/batch/create', data); + return request.post('user/relation/batch/create', data); } /** * 首页产品的轮播图和产品信息 @@ -161,23 +161,23 @@ export function collectAll(data) { * */ export function getGroomList(type, data) { - return request.get('product/spu/hot/' + type, data, { - noAuth: true - }); + return request.get('product/spu/hot/' + type, data, { + noAuth: true + }); } /** * 获取商品收藏列表 * @param object data */ -export function getCollectUserList(data) { - return request.get('user/relation/product/lst', data) +export function getCollectUserList(data) { + return request.get('user/relation/product/lst', data) } /** * 获取商品收藏列表 -- 删除 * @param object data */ export function userCollectDel(data) { - return request.post('user/relation/batch/delete', data) + return request.post('user/relation/batch/delete', data) } /** * 获取产品评论 @@ -186,43 +186,43 @@ export function userCollectDel(data) { * */ export function getReplyList(id, data) { - return request.get('store/product/reply/lst/' + id, data, { - noAuth: true - }) + return request.get('store/product/reply/lst/' + id, data, { + noAuth: true + }) } /** * 产品评价数量和好评度 * @param int id */ export function getReplyConfig(id) { - return request.get('reply/config/' + id); + return request.get('reply/config/' + id); } /** * 获取搜索关键字获取 * */ export function getSearchKeyword() { - return request.get('common/hot_keyword', {}, { - noAuth: true - }); + return request.get('common/hot_keyword', {}, { + noAuth: true + }); } /** * 门店列表 * @returns {*} */ export function storeListApi(data) { - return request.get("store_list", data, { - noAuth: true - }); + return request.get("store_list", data, { + noAuth: true + }); } /** * 商户列表 * @returns {*} */ export function storeMerchantList(data) { - return request.get("store/merchant/lst", data, { - noAuth: true - }); + return request.get("store/merchant/lst", data, { + noAuth: true + }); } /** * 获取商铺详情 @@ -230,9 +230,9 @@ export function storeMerchantList(data) { * @param {Object} data 商铺数据 */ export function getStoreDetail(id, data) { - return request.get("store/merchant/detail/" + id, data, { - noAuth: true - }); + return request.get("store/merchant/detail/" + id, data, { + noAuth: true + }); } /** * 获取商铺商品列表 @@ -240,9 +240,9 @@ export function getStoreDetail(id, data) { * @param {Object} data 商铺商品列表数据 */ export function getStoreGoods(id, data) { - return request.get("product/spu/merchant/" + id, data, { - noAuth: true - }); + return request.get("product/spu/merchant/" + id, data, { + noAuth: true + }); } /** * 获取商铺分类列表 @@ -250,77 +250,77 @@ export function getStoreGoods(id, data) { * @param {Object} data */ export function getStoreCategory(id, data) { - return request.get("store/merchant/category/lst/" + id, data, { - noAuth: true - }); + return request.get("store/merchant/category/lst/" + id, data, { + noAuth: true + }); } /** * 关注商铺 * @param {Object} type_id 商铺 id */ export function followStore(type_id) { - return request.post("user/relation/create", { - type: 10, - type_id: type_id - }); + return request.post("user/relation/create", { + type: 10, + type_id: type_id + }); } /** * 取消商铺关注 * @param {Object} type_id 商铺 id */ export function unfollowStore(type_id) { - return request.post("user/relation/delete", { - type: 10, - type_id: type_id - }); + return request.post("user/relation/delete", { + type: 10, + type_id: type_id + }); } /** * 获取商铺优惠券 * @param {Object} id */ export function getStoreCoupon(id) { - return request.get("coupon/store/" + id, { - noAuth: true - }); + return request.get("coupon/store/" + id, { + noAuth: true + }); } /** * 获取商铺优惠券 */ export function getMerchantLst(data) { - return request.get("user/relation/merchant/lst", data, { - noAuth: true - }); + return request.get("user/relation/merchant/lst", data, { + noAuth: true + }); } /** * 物流信息 */ export function express(id) { - return request.post("ordero/express/" + id, { - noAuth: true - }); + return request.post("ordero/express/" + id, { + noAuth: true + }); } /** * 子集分类 * @returns {*} */ export function storeCategory(pid) { - return request.get("store/product/category", pid, { - noAuth: true - }); + return request.get("store/product/category", pid, { + noAuth: true + }); } /** * 分销说明 * @returns {*} */ export function bagExplain() { - return request.get("store/product/bag/explain"); + return request.get("store/product/bag/explain"); } /** * 分销礼包推荐列表 * @returns {*} */ export function bagRecommend() { - return request.get("product/spu/bag/recommend"); + return request.get("product/spu/bag/recommend"); } /** * 分销礼包列表 @@ -328,56 +328,56 @@ export function bagRecommend() { */ export function productBag(data) { - return request.get("product/spu/bag", data, { - noAuth: true - }); + return request.get("product/spu/bag", data, { + noAuth: true + }); } /** * 商铺二维码 * @returns {*} */ export function merchantQrcode(id, data) { - return request.get("store/merchant/qrcode/" + id, data, { - noAuth: true - }); + return request.get("store/merchant/qrcode/" + id, data, { + noAuth: true + }); } /** * 推荐商品 * @returns {*} */ export function merchantProduct(id, data) { - if (data.brand_id && Array.isArray(data.brand_id)) { - data = { - ...data - } - data.brand_id = data.brand_id.toString() - } - return request.get("product/spu/merchant/" + id, data, { - noAuth: true - }); + if (data.brand_id && Array.isArray(data.brand_id)) { + data = { + ...data + } + data.brand_id = data.brand_id.toString() + } + return request.get("product/spu/merchant/" + id, data, { + noAuth: true + }); } /** * 推荐商品banner * @returns {*} */ export function getHotBanner(type) { - return request.get("common/hot_banner/" + type, {}, { - noAuth: true - }); + return request.get("common/hot_banner/" + type, {}, { + noAuth: true + }); } /** * 商户入驻表单 * @returns {*} */ export function create(data) { - return request.post("intention/create", data); + return request.post("intention/create", data); } /** * 商户入驻短信验证码 * @returns {*} */ export function verify(data) { - return request.post("auth/verify", data); + return request.post("auth/verify", data); } /** * 获取秒杀商品详情 @@ -385,36 +385,36 @@ export function verify(data) { * */ export function getSeckillProductDetail(id) { - return request.get('store/product/seckill/detail/' + id, {}, { - noAuth: true - }); + return request.get('store/product/seckill/detail/' + id, {}, { + noAuth: true + }); } /** * 直播推荐列表 * @returns {*} */ export function getLiveList(data) { - return request.get(`broadcast/hot`, data, { - noAuth: true - }); + return request.get(`broadcast/hot`, data, { + noAuth: true + }); } /** * 直播列表 * @returns {*} */ export function getBroadcastListApi(data) { - return request.get("broadcast/lst", data, { - noAuth: true - }); + return request.get("broadcast/lst", data, { + noAuth: true + }); } /** * 商户分类 * @returns {*} */ export function merClassifly() { - return request.get("intention/cate", {}, { - noAuth: true - }); + return request.get("intention/cate", {}, { + noAuth: true + }); } /** * 获取预售商品详情 @@ -422,9 +422,9 @@ export function merClassifly() { * */ export function getPresellProductDetail(id) { - return request.get('store/product/presell/detail/' + id, {}, { - noAuth: true - }); + return request.get('store/product/presell/detail/' + id, {}, { + noAuth: true + }); } /** * 获取商户申请记录 @@ -432,7 +432,7 @@ export function getPresellProductDetail(id) { * */ export function getApplicationRecordList(data) { - return request.get('intention/lst', data); + return request.get('intention/lst', data); } /** * 获取商户申请详情 @@ -440,7 +440,7 @@ export function getApplicationRecordList(data) { * */ export function getGoodsDetails(id) { - return request.get('intention/detail/' + id, {}); + return request.get('intention/detail/' + id, {}); } /** @@ -449,7 +449,7 @@ export function getGoodsDetails(id) { * */ export function updateGoodsRecord(id, data) { - return request.post('intention/update/' + id, data); + return request.post('intention/update/' + id, data); } /** * 获取定位详细地址 @@ -457,9 +457,9 @@ export function updateGoodsRecord(id, data) { * */ export function getGeocoder(data) { - return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, { - noAuth: true - }); + return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, { + noAuth: true + }); } /** * 获取店铺类型 @@ -467,80 +467,109 @@ export function getGeocoder(data) { * */ export function getStoreTypeApi() { - return request.get('intention/type', {}, { - noAuth: true - }); + return request.get('intention/type', { + sift_store: 0 + }, { + noAuth: true + }); } /** * 到货通知 * */ export function arrivalNoticeApi(data) { - return request.post('store/product/increase_take', data); + return request.post('store/product/increase_take', data); } /* 获取图片验证码 */ export function getCaptcha() { - return request.get('captcha'); + return request.get('captcha'); } /* 获取店铺资质 */ export function storeCertificate(data) { - return request.post(`store/certificate/${data.merId}`, data) + return request.post(`store/certificate/${data.merId}`, data) } /** * 本地服务列表 * @returns {*} */ export function storeServiceList(id, data) { - return request.get(`product/spu/local/${id}`, data, { - noAuth: true - }); + return request.get(`product/spu/local/${id}`, data, { + noAuth: true + }); } /** * 复制口令 * @returns {*} */ export function copyPasswordApi(data) { - return request.get(`product/spu/copy`, data, { - noAuth: true - }); + return request.get(`product/spu/copy`, data, { + noAuth: true + }); } /** * 口令搜索 * @returns {*} */ export function copyPasswordSearch(data) { - return request.get(`command/copy`, data, { - noAuth: true - }); + return request.get(`command/copy`, data, { + noAuth: true + }); } /** * 套餐列表 * @returns {*} */ export function getDiscountsLst(data) { - return request.get(`discounts/lst`, data, { - noAuth: true - }); + return request.get(`discounts/lst`, data, { + noAuth: true + }); } /** * 套餐--立即购买 * @returns {*} */ export function discountsCartAdd(data) { - return request.post('user/cart/batchCreate', data); + return request.post('user/cart/batchCreate', data); } /** * 商品--价格说明 * @returns {*} */ export function priceRuleApi(id) { - return request.get(`store/product/price_rule/${id}`, {}, { - noAuth: true - }); + return request.get(`store/product/price_rule/${id}`, {}, { + noAuth: true + }); +} +/** + * 供销市场标签 + * @returns {*} + */ +export function supMenuApi(data) { + return request.get('intention/v2/cate', data); +} +/** + * 供销市场标签 + * @returns {*} + */ +export function supAgoodsApi(data) { + return request.get('store/merchant/lst', data); +} +// /api/store / merchant / lst ? page = 1 & limit = 10 & order = & category_id = 22 & type_id = 10 & street_id = & +// credit_buy = +// /api/region/:street_id/merchant +/** + * 附近商家 + * @returns {*} + */ +// export function supAgoodsApi(data) { +// return request.get('store/merchant/lst', data); +// } +export function vicinityStoreApi(data) { + return request.get(`region/${data}/merchant`); } \ No newline at end of file diff --git a/api/user.js b/api/user.js index e3700ea..1f1fce7 100644 --- a/api/user.js +++ b/api/user.js @@ -9,6 +9,14 @@ // +---------------------------------------------------------------------- import request from "@/utils/request.js"; import Cache from '@/utils/cache' +/** + * 获取版本信息 + */ +export function Appversion(data) { + return request.get(`app/version`, data, { + noAuth: true + }); +} /** * 提交提现 */ @@ -707,4 +715,8 @@ export function hasServiceApi(id) { */ export function getBankInfo() { return request.get(`user/extract/history_bank`) +} +// 商户账单管理 +export function getBillDetil() { + return request.get(`mer/financial_record`) } \ No newline at end of file diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue index 620dbcf..09a9e07 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue @@ -80,7 +80,7 @@ export default { require: true }, type: { - type: Number, + type: Number|String, default: 0 }, isStore: { diff --git a/components/addressWindow/index.vue b/components/addressWindow/index.vue index 32a34a4..84300c4 100644 --- a/components/addressWindow/index.vue +++ b/components/addressWindow/index.vue @@ -8,7 +8,7 @@ {{item.real_name}}{{item.phone}} - {{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.detail}} + {{item.province}}{{item.city}}{{item.district}}{{item.street || ''}}{{item.brigade}}{{item.detail}} diff --git a/components/areaWindow/index.vue b/components/areaWindow/index.vue index 13797f3..d217e3a 100644 --- a/components/areaWindow/index.vue +++ b/components/areaWindow/index.vue @@ -36,7 +36,7 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- import {getAddressList} from '@/api/user.js'; - import { getCityV2 } from '@/api/api.js'; + import { getCityV2,village } from '@/api/api.js'; import { mapGetters } from "vuex"; const CACHE_ADDRESS = {}; export default { @@ -87,25 +87,74 @@ this.loadAddress(0) }, methods: { - change(pid,index){ + change(pid){ if(this.selectedIndex == index) return; if(pid === -1){ pid = this.selectedArr.length ? this.selectedArr[this.selectedArr.length -1].id : 0; } + console.log(index) this.selectedIndex = index; this.loadAddress(pid); }, - loadAddress(pid){ + loadAddress(pid,type){ if(CACHE_ADDRESS[pid]){ this.addressList = CACHE_ADDRESS[pid]; return ; } this.is_loading = true; - getCityV2(pid).then(res=>{ - this.is_loading = false; - CACHE_ADDRESS[pid] = res.data; - this.addressList = res.data; - }) + // getCityV2(pid).then(res=>{ + + // this.is_loading = false; + // CACHE_ADDRESS[pid] = res.data; + // this.addressList = res.data; + // }) + + if(type=='province'){ + + village({province_code:pid}).then(res=>{ + this.is_loading = false; + CACHE_ADDRESS[pid] = res.data; + this.addressList = res.data; + + }) + }else if(type=='city'){ + village({city_code:pid}).then(res=>{ + this.is_loading = false; + CACHE_ADDRESS[pid] = res.data; + this.addressList = res.data; + + }) + }else if(type=='area'){ + village({area_code:pid}).then(res=>{ + if(res.data.length>0){ + this.is_loading = false; + CACHE_ADDRESS[pid] = res.data; + this.addressList = res.data; + }else{ + this.$emit('submit', [...this.selectedArr]); + this.$emit('changeClose'); + } + }) + }else if(type=='street'){ + village({street_code:pid}).then(res=>{ + if(res.data.length>0){ + this.is_loading = false; + CACHE_ADDRESS[pid] = res.data; + this.addressList = res.data; + }else{ + this.$emit('submit', [...this.selectedArr]); + this.$emit('changeClose'); + } + }) + }else{ + + village().then(res=>{ + this.is_loading = false; + CACHE_ADDRESS[pid] = res.data; + this.addressList = res.data; + }) + } + this.goTop() }, selected(item){ @@ -114,17 +163,49 @@ this.selectedArr.splice(this.selectedIndex + 1,999) this.selectedArr[this.selectedIndex] = item; this.selectedIndex = -1; - }else if(!item.parent_id){ + } + + // else if(!item.parent_id){ + // this.selectedArr = [item]; + // }else{ + // this.selectedArr.push(item); + // } + else if(!item.id){ this.selectedArr = [item]; }else{ - this.selectedArr.push(item); + + if(this.selectedArr.length>4){ + let arry=[] + arry.push(item) + this.selectedArr=arry + }else{ + this.selectedArr.push(item); + } + + } - if(item.snum){ - this.loadAddress(item.id); + + if(item.type=="province"){ + + this.loadAddress(item.code,"province"); + + }else if(item.type=="city"){ + this.loadAddress(item.code,"city"); + }else if(item.type=="area"){ + this.loadAddress(item.code,"area"); + }else if(item.type=="street"){ + this.loadAddress(item.code,"street"); } else { this.$emit('submit', [...this.selectedArr]); this.$emit('changeClose'); } + + // if(item.snum){ + // this.loadAddress(item.id); + // } else { + // this.$emit('submit', [...this.selectedArr]); + // this.$emit('changeClose'); + // } this.goTop() }, close: function() { diff --git a/components/checkDelivery/index.vue b/components/checkDelivery/index.vue index 706c71c..f906f0b 100644 --- a/components/checkDelivery/index.vue +++ b/components/checkDelivery/index.vue @@ -9,9 +9,10 @@ - + {{item.title}} - + @@ -39,77 +40,79 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- - import { mapGetters } from "vuex"; - export default{ - name:'checkDelivery', - props:{ - isShowBox:{ - type:Boolean, - default:false + import { + mapGetters + } from "vuex"; + export default { + name: 'checkDelivery', + props: { + isShowBox: { + type: Boolean, + default: false }, - activeObj:{ - type:Object, - default:function(){ + activeObj: { + type: Object, + default: function() { return {} } }, - deliveryName:{ - type:String, - default:'快递配送' + deliveryName: { + type: String, + default: '快递配送' }, - radioList:{ - type:Array, - default: [ - { - title:'快递配送', - check:true + radioList: { + type: Array, + default: [{ + title: '快递配送', + check: true }, { - title:'到店核销', - check:false + title: '到店核销', + check: false } ], }, }, computed: mapGetters(['viewColor']), - data(){ + data() { return { - radioIndex:0, - oldRadioIndex:'', //旧的索引 - newData:{} + radioIndex: 0, + oldRadioIndex: '', //旧的索引 + newData: {} } }, created() { this.newData = JSON.parse(JSON.stringify(this.activeObj)) }, - methods:{ + methods: { // 关闭配送方式弹窗 - closeShowBox(){ + closeShowBox() { this.$emit('close') }, // 选择配送方式 - bindCheck(item,index){ + bindCheck(item, index) { this.newData.order.isTake = index }, - confirmBtn(){ - this.$emit('confirmBtn',this.newData) + confirmBtn() { + this.$emit('confirmBtn', this.newData) } } } + \ No newline at end of file diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index a9fc3b5..f1c4653 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -7,77 +7,120 @@ + + - + + - 预售{{item.cart_info.product.store_name}} - ￥{{item.cart_info.productPresellAttr.presell_price}}
x {{item.product_num}} + 预售{{item.cart_info.product.store_name}} + + ￥{{item.cart_info.productPresellAttr.presell_price}}
x + {{item.product_num}} - {{item.cart_info.productAttr.sku}} - 发货时间： + + {{item.cart_info.productAttr.sku}} + 发货时间： - {{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内 + {{ item.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内 - {{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内 - + {{ item.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ item.cart_info.productPresell.delivery_day }}天内 + - 申请退款 - 退款中 x {{item.product_num - item.refund_num}} - 已退款 x {{item.product_num - item.refund_num}} - 去评价 + + 申请退款 + 退款中 x + {{item.product_num - item.refund_num}} + 已退款 x + {{item.product_num - item.refund_num}} + + 去评价 已评价 - + 阶段一： 买家已付款 - 商品定金 ￥{{ orderData.pay_price }} - 定金实付款￥{{ orderData.pay_price }} + 商品定金 ￥{{ orderData.pay_price }} + 定金实付款￥{{ orderData.pay_price }} - 阶段二： - 未开始 - 等待买家付尾款 - 交易已关闭 + 阶段二： + 未开始 + 等待买家付尾款 + 交易已关闭 - 商品尾款 ￥{{ orderData.presellOrder.pay_price }} - 尾款需付款￥{{ orderData.presellOrder.pay_price }} + 商品尾款 ￥{{ orderData.presellOrder.pay_price }} + 尾款需付款￥{{ orderData.presellOrder.pay_price }} + - + + - - {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}{{item.cart_info.product.store_name}} - x {{item.product_num}} - - {{item.cart_info.productAttr.sku}} - ￥{{item.cart_info.productAssistAttr.assist_price}} - ￥{{item.cart_info.activeSku.active_price}} - - ￥{{item.cart_info.productAttr.price}} - + + {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}{{item.cart_info.product.store_name}} + x {{item.product_num}} + + + {{item.cart_info.productAttr.sku}} + + ￥{{item.cart_info.productAssistAttr.assist_price}} + + ￥{{item.cart_info.activeSku.active_price}} + + ￥{{item.cart_info.productAttr.price}} + + + - 退款中 x {{item.product_num - item.refund_num}} - 已退款 x {{item.product_num - item.refund_num}} - 申请退款 - 去评价 + 退款中 x + {{item.product_num - item.refund_num}} + 已退款 x {{item.product_num - item.refund_num}} + + + 申请退款 + 去评价 已评价 - + @@ -93,10 +136,18 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- - import { openOrderRefundSubscribe } from '@/utils/SubscribeMessage.js'; - import { goShopDetail } from '@/libs/order.js' - import { initiateAssistApi } from '@/api/activity.js'; - import { mapGetters } from "vuex"; + import { + openOrderRefundSubscribe + } from '@/utils/SubscribeMessage.js'; + import { + goShopDetail + } from '@/libs/order.js' + import { + initiateAssistApi + } from '@/api/activity.js'; + import { + mapGetters + } from "vuex"; export default { props: { evaluate: { @@ -131,14 +182,14 @@ computed: mapGetters(['viewColor']), data() { return { - totalNmu:'', + totalNmu: '', isTimePay: false, //是否到支付时间 }; }, - watch:{ - cartInfo:function(nVal,oVal){ + watch: { + cartInfo: function(nVal, oVal) { let num = 0 - nVal.forEach((item,index)=>{ + nVal.forEach((item, index) => { num += item.cart_num }) this.totalNmu = num @@ -149,52 +200,59 @@ }, mounted() {}, methods: { - evaluateTap:function(unique,orderId){ + evaluateTap: function(unique, orderId) { uni.navigateTo({ - url:`/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}` + url: `/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}` }) }, // 判断是否到支付尾款时间 - isPayBalance(){ + isPayBalance() { let that = this; - if(that.orderData.status === 10){ - if(new Date() < new Date(that.orderData.presellOrder.final_start_time)){ + if (that.orderData.status === 10) { + if (new Date() < new Date(that.orderData.presellOrder.final_start_time)) { that.isTimePay = false; //未开始 - }else if((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <= new Date(that.orderData.presellOrder.final_start_time)) ){ + } else if ((new Date() >= new Date(that.orderData.presellOrder.final_start_time)) && (new Date() <= + new Date(that.orderData.presellOrder.final_start_time))) { that.isTimePay = true; //立即支付 } } }, - jumpCon:function(item){ - if(item.product_type == 4)item.activity_id = item.cart_info && item.cart_info.activeSku.product_group_id - if(item.product_type == 3)item.activity_id = item.cart_info && item.cart_info.productAssistAttr.product_assist_id + jumpCon: function(item) { + if (item.product_type == 4) item.activity_id = item.cart_info && item.cart_info.activeSku + .product_group_id + if (item.product_type == 3) item.activity_id = item.cart_info && item.cart_info.productAssistAttr + .product_assist_id goShopDetail(item).then(res => { initiateAssistApi(item.activity_id).then(res => { let id = res.data.product_assist_set_id; - uni.hideLoading(); - uni.navigateTo({ - url: '/pages/activity/assist_detail/index?id=' + id - }); - }).catch((err) => { - uni.showToast({ - title: err, - icon: 'none' - }) + uni.hideLoading(); + uni.navigateTo({ + url: '/pages/activity/assist_detail/index?id=' + id + }); + }).catch((err) => { + uni.showToast({ + title: err, + icon: 'none' + }) }); - }) + }) }, // 退款 - refund(item){ + refund(item) { // #ifdef MP openOrderRefundSubscribe().then(() => { uni.hideLoading(); - if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1){ + if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) { uni.navigateTo({ - url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type + url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + + '&ids=' + item.order_product_id + '&refund_type=1&order_type=' + this + .orderData.order_type }) - }else{ + } else { uni.navigateTo({ - url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id + url: '/pages/users/refund/select?order_id=' + this.orderId + + '&type=1&order_type=' + this.orderData.order_type + '&ids=' + item + .order_product_id }) } }).catch(() => { @@ -202,13 +260,15 @@ }) // #endif // #ifdef H5 || APP-PLUS - if(this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1){ + if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual == 1) { uni.navigateTo({ - url:'/pages/users/refund/confirm?order_id='+this.orderId+'&type=1'+'&ids='+item.order_product_id+'&refund_type=1&order_type='+this.orderData.order_type + url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + '&ids=' + item + .order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type }) - }else{ + } else { uni.navigateTo({ - url:'/pages/users/refund/select?order_id='+this.orderId+'&type=1&order_type='+this.orderData.order_type+'&ids='+item.order_product_id + url: '/pages/users/refund/select?order_id=' + this.orderId + '&type=1&order_type=' + this + .orderData.order_type + '&ids=' + item.order_product_id }) } // #endif @@ -221,83 +281,101 @@ .orderGoods { background-color: #fff; } + .p-color { color: var(--view-priceColor); } - .t-color{ + + .t-color { color: var(--view-theme); } - .svip-img{ + + .svip-img { width: 65rpx; height: 28rpx; margin: 4rpx 0 0 4rpx; } - .title{ + + .title { height: 86rpx; position: relative; padding: 0 30rpx; - &::after{ + + &::after { content: ""; width: 750rpx; - border-bottom: 2rpx dotted #D8D8D8; + border-bottom: 2rpx dotted #D8D8D8; position: absolute; bottom: 0; left: 0; } - .item-status{ + + .item-status { color: #999999; font-size: 30rpx; - &.status0{ + + &.status0 { color: #2291F8; } } - .item-date{ + + .item-date { color: #666666; font-size: 28rpx; } - } - .right-btn-box{ + } + + .right-btn-box { display: flex; align-items: center; justify-content: flex-end; - &.event_box{ + + &.event_box { position: static; } - .btn-item{ + + .btn-item { display: flex; align-items: center; justify-content: center; - width:140rpx; - height:46rpx; + width: 140rpx; + height: 46rpx; margin-left: 10rpx; - border:1px solid rgba(187,187,187,1); - border-radius:23rpx; + border: 1px solid rgba(187, 187, 187, 1); + border-radius: 23rpx; font-size: 24rpx; color: #282828; - &.on{ - background:rgba(220,220,220,1); - border-color: rgba(220,220,220,1); + + &.on { + background: rgba(220, 220, 220, 1); + border-color: rgba(220, 220, 220, 1); } - &.err{ - background:rgba(247,247,247,1); - border-color: rgba(247,247,247,1); + + &.err { + background: rgba(247, 247, 247, 1); + border-color: rgba(247, 247, 247, 1); color: #AAAAAA; } } } - .event_bg{ + + .event_bg { background: #FF7F00; } - .event_color{ + + .event_color { color: #FF7F00; } - .presell_item{ + + .presell_item { height: auto; padding-bottom: 15rpx; } - .event_progress{ + + .event_progress { margin-top: 20rpx; background: #fff; + .progress_name { padding-left: 30rpx; height: 60rpx; @@ -306,7 +384,8 @@ font-weight: bold; position: relative; color: var(--view-theme); - &::before{ + + &::before { content: ""; display: inline-block; width: 5rpx; @@ -317,43 +396,49 @@ left: 0; } } - .align_right{ + + .align_right { float: right; font-weight: bold; } - .progress_price{ + + .progress_price { padding: 20rpx 30rpx; color: #999999; font-size: 22rpx; } - .progress_pay{ + + .progress_pay { padding: 25rpx 30rpx; background: var(--view-minorColor); font-size: 26rpx; color: #282828; } } - .event_name{ + + .event_name { display: inline-block; margin-right: 9rpx; color: #fff; font-size: 20rpx; padding: 0 8rpx; - line-height: 30rpx; + line-height: 30rpx; text-align: center; - border-radius: 6rpx; + border-radius: 6rpx; } - .event_ship{ + + .event_ship { font-size: 20rpx; - margin-top: 10rpx; + margin-top: 10rpx; } - .goodWrapper.item1{ - &::after{ + + .goodWrapper.item1 { + &::after { content: ""; display: block; width: 750rpx; height: 14rpx; background: #F0F0F0; - } + } } - + \ No newline at end of file diff --git a/components/payment/index.vue b/components/payment/index.vue index 27a9da1..a27272f 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -4,8 +4,8 @@ 选择付款方式 - + @@ -78,6 +78,7 @@ }); }, goPay: function(number, paytype) { + if (this.isCall) { return this.$emit('onChangeFun', { action: 'payCheck', @@ -98,13 +99,17 @@ // #endif } else if (paytype == 'balance') { type = 'balance'; - }else if(paytype == 'alipay'){ + console.log('123'); + } else if (paytype == 'alipay') { // #ifndef MP type = 'alipay'; // #endif // #ifdef MP type = 'alipayQr'; // #endif + } else if (paytype == 'creditBuy') { + console.log('123123'); + type = 'creditBuy' } if (!that.order_id) return that.$util.Tips({ title: '请选择要支付的订单' @@ -115,20 +120,27 @@ uni.showLoading({ title: '支付中' }); - let orderApi = that.order_type === 1 ? presellOrderPay : orderPay + let orderApi = that.order_type === 1 ? presellOrderPay : orderPay orderApi(that.order_id, { type: type, // #ifdef H5 - return_url: 'http://'+window.location.host+'/pages/users/order_list/index', + + return_url: this.order_type == 98 ? 'http://' + window.location.host + + '/pages/users/order_list/indexCopy' : 'http://' + window.location.host + + '/pages/users/order_list/index', + + // #endif - + }).then(res => { let status = res.data.status, orderId = res.data.result.order_id, jsConfig = res.data.result.config, callback_key = res.data.result.pay_key, - goPages = '/pages/users/order_list/index'; - switch (status) { + + goPages = this.order_type == 98 ? '/pages/users/order_list/indexCopy' : + '/pages/users/order_list/index' + switch (status) { case 'ORDER_EXIST': case 'EXTEND_ORDER': case 'PAY_ERROR': @@ -139,19 +151,19 @@ }); return that.$util.Tips({ title: res.message - }); + }); break; case 'success': uni.hideLoading(); this.$emit('onChangeFun', { action: 'payClose' - }); + }); return that.$util.Tips({ title: '支付成功', icon: 'success' }, { tab: 5, - url: goPages + '?status=1' + url: goPages + '?status=2' }); break; case 'alipay': @@ -159,19 +171,20 @@ uni.hideLoading(); this.$emit('onChangeFun', { action: 'payClose' - }); + }); uni.navigateTo({ - url: '/pages/order_pay_back/index?keyCode='+callback_key+'&url='+jsConfig, - }) - return - break; - // #ifndef MP + url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' + + jsConfig, + }) + return + break; + // #ifndef MP case "wechat": case "weixin": case "weixinApp": jsConfig.timeStamp = jsConfig.timestamp; // #ifndef APP-PLUS - that.$wechat.pay(jsConfig).then(res => { + that.$wechat.pay(jsConfig).then(res => { // console.log('测试支付数据无效的success：'+res.data) this.$emit('onChangeFun', { action: 'payClose' @@ -180,35 +193,36 @@ return that.$util.Tips({ title: '支付成功', icon: 'success' - }, { + }, { tab: 5, - url: goPages + 'status=1' + url: goPages + 'status=2' }); }).catch(res => { // console.log('测试支付数据无效的catch：'+res.data) - if (res.errMsg == 'chooseWXPay:cancel'){ - if(that.isCall){ + if (res.errMsg == 'chooseWXPay:cancel') { + if (that.isCall) { return that.$util.Tips({ title: '取消支付' }); - }else{ + } else { return that.$util.Tips({ title: '取消支付' - }, { + }, { tab: 5, - url: goPages + '?status=0' + url: goPages + '?status=1' }); } - } + } }) // #endif // #ifdef APP-PLUS - let mp_pay_name='' - if(uni.requestOrderPayment){ - mp_pay_name='requestOrderPayment' - }else{ - mp_pay_name='requestPayment' + let mp_pay_name = '' + if (uni.requestOrderPayment) { + mp_pay_name = 'requestOrderPayment' + } else { + mp_pay_name = 'requestPayment' } + console.log(mp_pay_name, jsConfig) uni[mp_pay_name]({ provider: 'wxpay', orderInfo: jsConfig, @@ -219,22 +233,23 @@ return that.$util.Tips({ title: '支付成功', icon: 'success' - }, { + }, { tab: 5, - url: goPages + 'status=1' + url: goPages + 'status=2' }); }, fail: (e) => { - if(that.isCall){ + console.log(e) + if (that.isCall) { return that.$util.Tips({ title: '取消支付' }); - }else{ + } else { return that.$util.Tips({ title: '取消支付' - }, { + }, { tab: 5, - url: goPages + '?status=0' + url: goPages + '?status=1' }); } }, @@ -244,16 +259,16 @@ }); // #endif break; - // #endif - // #ifdef MP + // #endif + // #ifdef MP case "routine": jsConfig.timeStamp = jsConfig.timestamp; that.toPay = true; - let mp_pay_name='' - if(uni.requestOrderPayment){ - mp_pay_name='requestOrderPayment' - }else{ - mp_pay_name='requestPayment' + let mp_pay_name = '' + if (uni.requestOrderPayment) { + mp_pay_name = 'requestOrderPayment' + } else { + mp_pay_name = 'requestPayment' } uni[mp_pay_name]({ ...jsConfig, @@ -262,21 +277,22 @@ that.$emit('onChangeFun', { action: 'payClose' }); - if (that.BargainId || that.combinationId || that.pinkId || that.seckillId) + if (that.BargainId || that.combinationId || that.pinkId || that + .seckillId) return that.$util.Tips({ title: '支付成功', icon: 'success' - }, { + }, { tab: 5, - url: goPages + '?status=1' + url: goPages + '?status=2' }); - + return that.$util.Tips({ title: '支付成功', icon: 'success' - }, { + }, { tab: 5, - url: goPages + '?status=1' + url: goPages + '?status=2' }); }, fail: function(e) { @@ -289,18 +305,19 @@ }); }, complete: function(e) { - uni.hideLoading(); + uni.hideLoading(); //关闭当前页面跳转至订单状态 - if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({ - title: '取消支付' - }); + if (res.errMsg == 'requestPayment:cancel') return that.$util + .Tips({ + title: '取消支付' + }); that.$emit('onChangeFun', { action: 'payClose' }); }, }) break; - // #endif + // #endif case "balance": uni.hideLoading(); that.$emit('onChangeFun', { @@ -311,9 +328,9 @@ title: res.message }); break; - // #ifdef H5 + // #ifdef H5 case 'h5': - let host = window.location.protocol+"//"+window.location.host; + let host = window.location.protocol + "//" + window.location.host; let url = `${host}/pages/order_pay_status/index?order_id=${orderId}` let eUrl = encodeURIComponent(url) let jsurl = jsConfig.mweb_url || jsConfig.h5_url @@ -322,9 +339,9 @@ location.href = locations; }, 100); break; - // #endif - - // #ifdef APP-PLUS + // #endif + + // #ifdef APP-PLUS case 'alipayApp': uni.requestPayment({ provider: 'alipay', @@ -336,11 +353,11 @@ return that.$util.Tips({ title: '支付成功', icon: 'success' - }, { + }, { tab: 5, - url: goPages + 'status=1' + url: goPages + 'status=2' }); - + }, fail: (e) => { return that.$util.Tips({ @@ -351,8 +368,8 @@ uni.hideLoading(); }, }); - break; - // #endif + break; + // #endif } }).catch(err => { uni.hideLoading(); @@ -375,7 +392,7 @@ border-radius: 16rpx 16rpx 0 0; background-color: #fff; padding-bottom: 60rpx; - z-index: 99; + z-index: 99999; transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9); transform: translate3d(0, 100%, 0); } @@ -456,4 +473,4 @@ font-size: 0.3rpx; color: #999; } - + \ No newline at end of file diff --git a/components/plantConSwiper/index.vue b/components/plantConSwiper/index.vue index 119fb9d..ea15751 100644 --- a/components/plantConSwiper/index.vue +++ b/components/plantConSwiper/index.vue @@ -5,7 +5,7 @@ - + diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index 52307f3..121f55c 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -360,27 +360,36 @@ margin-right: 30rpx; } .product-window .cart .carnum .item { - border: 1px solid #a4a4a4; - width: 84rpx; + + width: 63rpx; text-align: center; height: 100%; - line-height: 54rpx; - color: #a4a4a4; - font-size: 45rpx; + line-height: 42rpx; + color: #333333; + font-weight: 400; + font-size: 26rpx; + } .product-window .cart .carnum .reduce { - border-right: 0; - border-radius: 6rpx 0 0 6rpx; - line-height: 48rpx; + border: 1px solid #a4a4a4; + width: 44rpx; + height: 42rpx; + // border-right: 0; + border-radius: 0 7rpx 7rpx 0; + line-height: 30rpx; + } .product-window .cart .carnum .reduce.on { border-color: #e3e3e3; color: #dedede; } .product-window .cart .carnum .plus { - border-left: 0; - border-radius: 0 6rpx 6rpx 0; - line-height: 46rpx; + border: 1px solid #a4a4a4; + width: 44rpx; + height: 42rpx; + // border-right: 0; + border-radius: 0 7rpx 7rpx 0; + line-height: 30rpx } .product-window .cart .carnum .plus.on { border-color: #e3e3e3; diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index 2d461b0..dc15f5e 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -1,285 +1,340 @@ - \ No newline at end of file diff --git a/config/app.js b/config/app.js index 3c22e78..5b88400 100644 --- a/config/app.js +++ b/config/app.js @@ -9,23 +9,25 @@ let httpApiThree // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' // 测试 if (process.env.NODE_ENV === "development") { - // httpApi = 'https://shop.lihaink.cn' // 生产 - httpApi = "https://crmeb-test.shop.lihaink.cn" - // httpApi = "http://192.168.0.222" - // #ifdef MP-WEIXIN - httpApiTwo = "https://nk.lihaink.cn" - httpApiThree = 'http://ceshi-oa.lihaink.cn' - // #endif - // #ifdef H5 - // httpApiTwo = "baseUrl" // h5跨域配置 - httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 - // httpApiThree = 'baseUrlTest' // h5跨域配置 - // #endif + httpApi = 'https://shop.lihaink.cn' // 生产 + // httpApi = "https://crmeb-test.shop.lihaink.cn" + // httpApi = "http://192.168.0.222" + // httpApi = "http://192.168.0.108:8325" + // httpApi = 'http://192.168.0.108:8325' + // #ifdef MP-WEIXIN + httpApiTwo = "https://nk.lihaink.cn" + httpApiThree = 'http://ceshi-oa.lihaink.cn' + // #endif + // #ifdef H5 + // httpApiTwo = "baseUrl" // h5跨域配置 + httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 + // httpApiThree = 'baseUrlTest' // h5跨域配置 + // #endif } else if (process.env.NODE_ENV === 'production') { - // httpApi = 'https://shop.lihaink.cn' // 生产 - httpApi = "https://crmeb-test.shop.lihaink.cn" - httpApiTwo = 'https://nk.lihaink.cn' // 生产 - httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 + // httpApi = 'https://shop.lihaink.cn' // 生产 + httpApi = "https://crmeb-test.shop.lihaink.cn" + httpApiTwo = 'https://nk.lihaink.cn' // 生产 + httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 } // httpApi = 'https://shop.lihaink.cn' // 生产 // httpApiTwo = 'https://nk.lihaink.cn' // 生产 @@ -35,37 +37,37 @@ if (process.env.NODE_ENV === "development") { let wsApi = 'wss://shop.lihaink.cn' module.exports = { - // 请求域名 格式： https://您的域名 - // #ifdef MP || APP-PLUS - // HTTP_REQUEST_URL: httpApi, - HTTP_REQUEST_URL: httpApi, - HTTP_REQUEST_URL_TWO: httpApiTwo, - HTTP_REQUEST_URL_THREE: httpApiThree, - VUE_APP_WS_URL: `${wsApi}?type=user`, - // #endif + // 请求域名 格式： https://您的域名 + // #ifdef MP || APP-PLUS + // HTTP_REQUEST_URL: httpApi, + HTTP_REQUEST_URL: httpApi, + HTTP_REQUEST_URL_TWO: httpApiTwo, + HTTP_REQUEST_URL_THREE: httpApiThree, + VUE_APP_WS_URL: `${wsApi}?type=user`, + // #endif - // #ifdef H5 - //H5接口是浏览器地址 - HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host, - HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host, - // 聊天长连接地址 - VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL, - // #endif - openPlantGrass: openPlantGrass, - HEADER: { - 'content-type': 'application/json', - //#ifdef H5 - 'Form-type': navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1 ? 'wechat' : 'h5', - //#endif - //#ifdef MP - 'Form-type': 'routine', - //#endif - //#ifdef APP-PLUS - 'Form-type': 'app', - //#endif - }, - // 回话密钥名称 请勿修改此配置 - TOKENNAME: 'X-Token', - // 缓存时间 0 永久 - EXPIRE: 0, + // #ifdef H5 + //H5接口是浏览器地址 + HTTP_REQUEST_URL: httpApi || window.location.protocol + "//" + window.location.host, + HTTP_REQUEST_URL_TWO: httpApiTwo || window.location.protocol + "//" + window.location.host, + // 聊天长连接地址 + VUE_APP_WS_URL: wsApi ? `${wsApi}?type=user` : VUE_APP_WS_URL, + // #endif + openPlantGrass: openPlantGrass, + HEADER: { + 'content-type': 'application/json', + //#ifdef H5 + 'Form-type': navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1 ? 'wechat' : 'h5', + //#endif + //#ifdef MP + 'Form-type': 'routine', + //#endif + //#ifdef APP-PLUS + 'Form-type': 'app', + //#endif + }, + // 回话密钥名称 请勿修改此配置 + TOKENNAME: 'X-Token', + // 缓存时间 0 永久 + EXPIRE: 0, }; \ No newline at end of file diff --git a/config/cache.js b/config/cache.js index b824d12..b414d1e 100644 --- a/config/cache.js +++ b/config/cache.js @@ -38,4 +38,6 @@ module.exports = { CACHE_LONGITUDE: 'LONGITUDE', //缓存纬度 CACHE_LATITUDE: 'LATITUDE', + //缓存地址信息 + ADRESS_LOCATION:'ADRESS_LOCATION' } diff --git a/main.js b/main.js index 755bfea..c99b17d 100644 --- a/main.js +++ b/main.js @@ -12,7 +12,9 @@ import App from './App' import store from './store' import Cache from './utils/cache' import util from 'utils/util' -import { HTTP_REQUEST_URL } from '@/config/app'; +import { + HTTP_REQUEST_URL +} from '@/config/app'; import skeleton from './components/skeleton/index.vue' import BaseMoney from './components/BaseMoney.vue'; import uView from '@/uni_modules/uview-ui' @@ -23,59 +25,63 @@ Vue.prototype.$util = util; Vue.prototype.$Cache = Cache; Vue.prototype.$eventHub = new Vue(); Vue.config.productionTip = false - +Vue.prototype.$bus = new Vue(); // #ifdef H5 -import { parseQuery } from "./utils"; +import { + parseQuery +} from "./utils"; import Auth from './libs/wechat'; -import { SPREAD } from './config/cache'; +import { + SPREAD +} from './config/cache'; // import wx from '@/node_modules/jweixin-module/lib/index' var __s = document.createElement('script'); __s.src = HTTP_REQUEST_URL + "/api/script"; document.head.appendChild(__s); Vue.prototype.$wechat = Auth; let cookieName = "VCONSOLE", - query = parseQuery(), - urlSpread = query["spread"], - vconsole = query[cookieName.toLowerCase()], - md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式 - md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式 + query = parseQuery(), + urlSpread = query["spread"], + vconsole = query[cookieName.toLowerCase()], + md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式 + md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式 if (urlSpread !== undefined) { - var spread = Cache.get(SPREAD); - urlSpread = parseInt(urlSpread); - if (!Number.isNaN(urlSpread) && spread !== urlSpread) { - Cache.set("spread", urlSpread || 0); - } else if (spread === 0 || typeof spread !== "number") { - Cache.set("spread", urlSpread || 0); - } + var spread = Cache.get(SPREAD); + urlSpread = parseInt(urlSpread); + if (!Number.isNaN(urlSpread) && spread !== urlSpread) { + Cache.set("spread", urlSpread || 0); + } else if (spread === 0 || typeof spread !== "number") { + Cache.set("spread", urlSpread || 0); + } } if (vconsole !== undefined) { - if (vconsole === md5UnCrmeb && Cache.has(cookieName)) - Cache.clear(cookieName); + if (vconsole === md5UnCrmeb && Cache.has(cookieName)) + Cache.clear(cookieName); } else vconsole = Cache.get(cookieName); import VConsole from './components/vconsole.min.js' if (vconsole !== undefined && vconsole === md5Crmeb) { - Cache.set(cookieName, md5Crmeb, 3600); - let vConsole = new VConsole(); + Cache.set(cookieName, md5Crmeb, 3600); + let vConsole = new VConsole(); } // 注册全局防抖指令 Vue.directive('debounce', { - inserted: (el, binding) => { - let debounceTime = binding.value || 2000 - let timer - el.addEventListener('click', e => { - el.style.pointerEvents = 'none'; - if (!el.disabled) { - timer = setTimeout(() => { - el.style.pointerEvents = 'auto' - }, debounceTime) - } - }, true) - } + inserted: (el, binding) => { + let debounceTime = binding.value || 2000 + let timer + el.addEventListener('click', e => { + el.style.pointerEvents = 'none'; + if (!el.disabled) { + timer = setTimeout(() => { + el.style.pointerEvents = 'auto' + }, debounceTime) + } + }, true) + } }) // if(!!!Auth.isAndroid() && Auth.isWeixin()){ @@ -86,12 +92,17 @@ Vue.directive('debounce', { // #endif +let appInfo = uni.getSystemInfo().then(res => { + Vue.prototype.$appInfo = res[1]; +}); + + App.mpType = 'app' const app = new Vue({ - ...App, - store, - Cache + ...App, + store, + Cache }) app.$mount(); \ No newline at end of file diff --git a/manifest.json b/manifest.json index 5ce9365..92ddd3b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.0.15", - "versionCode" : 138, + "versionName" : "1.3.5", + "versionCode" : 135, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -26,7 +26,12 @@ "Camera" : {}, "Geolocation" : {}, "Payment" : {}, - "Share" : {} + "Share" : {}, + "OAuth" : {}, + "UniMP" : { + "description" : "uni小程序" + }, + "Maps" : {} }, "safearea" : { "bottom" : { @@ -80,7 +85,8 @@ "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报", "NSCameraUsageDescription" : "上传用户头像保存分享海报", "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", - "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" + "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店" }, "idfa" : false, "dSYMs" : false @@ -89,13 +95,13 @@ "sdkConfigs" : { "maps" : { "amap" : { - "appkey_ios" : "", - "appkey_android" : "" + "appkey_ios" : "048d9f3f323eea894b49c3a7edbc8d87", + "appkey_android" : "048d9f3f323eea894b49c3a7edbc8d87" } }, "payment" : { "weixin" : { - "__platform__" : [ "android" ], + "__platform__" : [ "ios", "android" ], "appid" : "wx9d68c92b550ddd1e", "UniversalLinks" : "https://mer.crmeb.net/" } @@ -111,9 +117,7 @@ "__platform__" : [ "ios", "android" ] } }, - "oauth" : { - "apple" : {} - }, + "oauth" : {}, "ad" : {} }, "icons" : { @@ -329,3 +333,6 @@ "template" : "template.h5.html" } } +//拨打电话权限关闭 +/* ios打包配置 */ + diff --git a/pages.json b/pages.json index 5995e80..36b9f80 100644 --- a/pages.json +++ b/pages.json @@ -1,1354 +1,1648 @@ { - "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "首页", - "navigationStyle": "custom", - "enablePullDownRefresh": true, - // #ifdef APP-PLUS - "enablePullDownRefresh": true, - // #endif - "app-plus": { - "scrollIndicator": false //禁用原生导航栏 - } - } - }, - { - "path": "pages/gather/gather", - "style": { - "navigationBarTitleText": "工作台", - "navigationStyle": "custom", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/plant_release/index", - "style": { - "navigationBarTitleText": "常用", - "navigationStyle": "custom", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/order_addcart/order_addcart", - "style": { - "navigationBarTitleText": "购物车" - } - }, - { - "path": "pages/plant_grass/index", - "style": { - // "navigationStyle": "custom", - "navigationBarTitleText": "种草社区" - } - }, - { - "path": "pages/user/index", - "style": { - "navigationBarTitleText": "个人中心", - "navigationStyle": "custom" - } - }, - { - "path": "pages/news_list/index", - "style": { - "navigationBarTitleText": "资讯" - } - }, - { - "path": "pages/news_details/index", - "style": { - "navigationBarTitleText": "资讯详情" - } - }, - { - "path": "pages/auth/index", - "style": { - "navigationBarTitleText": "加载中" - } - }, - { - "path": "pages/order_pay_status/index", - "style": { - "navigationBarTitleText": "支付状态" - } - }, - { - "path": "pages/error/index", - "style": { - "navigationBarTitleText": "网站已关闭" - } - }, - { - "path": "pages/order_pay_back/index", - "style": { - "navigationBarTitleText": "支付提示" - } - }, { - "path": "pages/supply_chains/supply_chains", - "style": { - "navigationBarTitleText": "供应", - "enablePullDownRefresh": true, - "navigationStyle": "custom" - } - - } - ], - "subPackages": [{ - "root": "pages/goods_cate", - "name": "goods_cate", - "pages": [{ - "path": "goods_cate", - "style": { - "navigationBarTitleText": "商品分类" - } - }] - }, - { - "root": "pages/goods_details", - "name": "goods_details", - "pages": [{ - "path": "index", - "style": { - "navigationStyle": "custom" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif - } - }] - }, - { - "root": "pages/order_details", - "name": "order_details", - "pages": [{ - "path": "index", - "style": { - "navigationBarTitleText": "订单详情" - //, - //"navigationBarBackgroundColor": "#e93323" - // #ifdef MP || APP-PLUS - // , - //"navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "stay", - "style": { - "navigationBarTitleText": "订单详情" - //, - //"navigationBarBackgroundColor": "#e93323" - // #ifdef MP || APP-PLUS - // , - //"navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "delivery", - "style": { - "navigationBarTitleText": "配送详情" - //, - //"navigationBarBackgroundColor": "#e93323" - // #ifdef MP || APP-PLUS - // , - //"navigationBarTextStyle": "#fff" - // #endif - } - } - ] - }, - { - "root": "pages/nongKe", - "name": "nongKe", - "pages": [{ - "path": "gather/select_warehouse", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": true - } - }, { - "path": "goods_list/index", - "style": { - "navigationBarTitleText": "里海云仓", - "enablePullDownRefresh": true - } - }, - { - "path": "supply_chain/goods_list", - "style": { - "navigationBarTitleText": "商品列表", - "enablePullDownRefresh": true - } - - }, { - "path": "supply_chain/finance", - "style": { - "navigationBarTitleText": "财务管理", - "enablePullDownRefresh": false - } - - }, { - "path": "supply_chain/supplier", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": true, - "navigationBarBackgroundColor": "#e93323" - // "navigationStyle": "custom" - } - - }, { - "path": "supply_chain/merchant", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - }, { - "path": "supply_chain/purchase_control", - "style": { - "navigationBarTitleText": "进货管理", - "enablePullDownRefresh": false - } - - }, { - "path": "supply_chain/shopping_trolley", - "style": { - "navigationBarTitleText": "购物车", - "enablePullDownRefresh": false - } - - }, { - "path": "cloud_entrepot/index", - "style": { - "navigationBarTitleText": "里海云仓", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "teach_video/teach_video", - "style" : - { - "navigationBarTitleText": "教学视频", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - - } - ] - }, - { - "root": "pages/users", - "name": "users", - "pages": [{ - "path": "retrievePassword/index", - "style": { - "navigationBarTitleText": "忘记密码" - } - }, - { - "path": "user_setting/index", - "style": { - "navigationBarTitleText": "设置" - } - }, - //协议，关于 - { - "path": "user_about/index", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "agreement_rules/index", - "style": { - "navigationBarTitleText": "协议规则" - } - }, - { - "path": "user_info/index", - "style": { - "navigationBarTitleText": "个人资料" - } - }, - { - "path": "user_nickname/index", - "style": { - "navigationBarTitleText": "昵称" - } - }, - { - "path": "user_get_coupon/index", - "style": { - "navigationBarTitleText": "领取优惠券" - } - }, - { - "path": "user_goods_collection/index", - "style": { - "navigationBarTitleText": "我的收藏" - } - }, - { - "path": "user_sgin/index", - "style": { - "navigationBarTitleText": "签到" - } - }, - { - "path": "user_sgin_list/index", - "style": { - "navigationBarTitleText": "签到记录" - } - }, - { - "path": "user_money/index", - "style": { - "navigationBarTitleText": "我的账户" - } - }, - { - "path": "user_bill/index", - "style": { - "navigationBarTitleText": "账单明细" - } - }, - { - "path": "user_integral/index", - "style": { - "navigationBarTitleText": "积分详情" - } - }, - { - "path": "user_brokerage/index", - "style": { - "navigationBarTitleText": "分销等级" - } - }, - { - "path": "user_grade/index", - "style": { - "navigationBarTitleText": "我的等级", - "navigationBarBackgroundColor": "#282828" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "user_grade_list/index", - "style": { - "navigationBarTitleText": "成长值记录", - "navigationBarBackgroundColor": "#282828" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "user_coupon/index", - "style": { - "navigationBarTitleText": "我的优惠券" - } - }, - { - "path": "user_spread_user/index", - "style": { - "navigationBarTitleText": "我的推广" - } - }, - { - "path": "user_spread_code/index", - "style": { - "navigationBarTitleText": "分销海报" - } - }, - { - "path": "user_spread_money/index", - "style": { - "navigationBarTitleText": "佣金记录" - } - }, - { - "path": "user_cash/index", - "style": { - "navigationBarTitleText": "提现" - } - }, + "pages": [ + //#ifdef APP-PLUS + //启动页 { - "path": "gather_list/index" , - "style": { - "navigationBarTitleText": "提现流水" + "path": "pages/guide/judge", + "style": { + "enablePullDownRefresh": false, + "onReachBottomDistance": 100, + "navigationStyle": "custom", + "app-plus": { + "contentAdjust": false, + "bounce": "none" + } + } + }, + { + "path": "pages/guide/guide", + "style": { + "enablePullDownRefresh": false, + "onReachBottomDistance": 100, + "navigationStyle": "custom", + "app-plus": { + "contentAdjust": false, + "bounce": "none" + } + } + }, + // #endif + //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "首页", + "navigationStyle": "custom", + "enablePullDownRefresh": true, + // #ifdef APP-PLUS + "enablePullDownRefresh": true, + // #endif + "app-plus": { + "scrollIndicator": false //禁用原生导航栏 + } + } + }, + { + "path": "pages/gather/gather", + "style": { + "navigationBarTitleText": "工作台", + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/plant_release/index", + "style": { + "navigationBarTitleText": "常用", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/order_addcart/order_addcart", + "style": { + "navigationBarTitleText": "购物车" + } + }, + { + "path": "pages/plant_grass/index", + "style": { + // "navigationStyle": "custom", + "navigationBarTitleText": "种草社区" + } + }, + { + "path": "pages/user/index", + "style": { + "navigationBarTitleText": "个人中心", + "navigationStyle": "custom" + } + }, + { + "path": "pages/news_list/index", + "style": { + "navigationBarTitleText": "资讯" + } + }, + { + "path": "pages/news_details/index", + "style": { + "navigationBarTitleText": "资讯详情" + } + }, + { + "path": "pages/auth/index", + "style": { + "navigationBarTitleText": "加载中" + } + }, + { + "path": "pages/order_pay_status/index", + "style": { + "navigationBarTitleText": "支付状态" + } + }, + { + "path": "pages/error/index", + "style": { + "navigationBarTitleText": "网站已关闭" + } + }, + { + "path": "pages/order_pay_back/index", + "style": { + "navigationBarTitleText": "支付提示" + } + }, { + "path": "pages/supply_chains/supply_chains", + "style": { + "navigationBarTitleText": "供应", + "enablePullDownRefresh": true, + "navigationStyle": "custom" + } + + }, { + "path": "pages/moreProject/moreProject", + "style": { + "navigationBarTitleText": "更多功能", + "enablePullDownRefresh": false + } + } - }, - { - "path": "user_address_list/index", - "style": { - "navigationBarTitleText": "地址管理" - } - }, - { - "path": "user_address/index", - "style": { - "navigationBarTitleText": "添加地址" - } - }, - { - "path": "user_phone/index", - "style": { - "navigationBarTitleText": "绑定手机" - } - }, - { - "path": "user_modify_phone/index", - "style": { - "navigationBarTitleText": "修改手机号" - } - }, - { - "path": "user_modify_pwd/index", - "style": { - "navigationBarTitleText": "修改密码" - } - }, - { - "path": "user_payment/index", - "style": { - "navigationBarTitleText": "余额充值" - } - }, - { - "path": "user_pwd_edit/index", - "style": { - "navigationBarTitleText": "修改密码" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "order_confirm/index", - "style": { - "navigationBarTitleText": "提交订单" - } - }, - { - "path": "goods_details_store/index", - "style": { - "navigationBarTitleText": "门店列表" - } - }, - { - "path": "promoter-list/index", - "style": { - "navigationBarTitleText": "推广人列表" - } - }, - { - "path": "promoter-order/index", - "style": { - "navigationBarTitleText": "推广人订单" - } - }, - { - "path": "promoter_rank/index", - "style": { - "navigationBarTitleText": "推广人排行" - } - }, - { - "path": "commission_rank/index", - "style": { - "navigationBarTitleText": "佣金排行" - } - }, - { - "path": "order_list/index", - "style": { - "navigationBarTitleText": "我的订单" - } - }, - { - "path": "order_list/search", - "style": { - "navigationBarTitleText": "我的订单" - } - }, - { - "path": "presell_order_list/index", - "style": { - "navigationBarTitleText": "预售订单" - } - }, - { - "path": "goods_logistics/index", - "style": { - "navigationBarTitleText": "物流信息" - } - }, - { - "path": "user_return_list/index", - "style": { - "navigationBarTitleText": "退货列表" - } - }, - { - "path": "goods_return/index", - "style": { - "navigationBarTitleText": "申请退货" - } - }, - { - "path": "login/login_copy", - "style": { - "navigationBarTitleText": "登录", - "navigationBarBackgroundColor": "#EB5447", - "navigationStyle": "custom" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "goods_comment_list/index", - "style": { - "navigationBarTitleText": "商品评分" - } - }, - { - "path": "goods_comment_con/index", - "style": { - "navigationBarTitleText": "商品评价" - } - }, - { - "path": "feedback/index", - "style": { - "navigationBarTitleText": "问题反馈", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "feedback/list", - "style": { - "navigationBarTitleText": "反馈记录", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "feedback/detail", - "style": { - "navigationBarTitleText": "反馈内容", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "refund/index", - "style": { - "navigationBarTitleText": "批量退款", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "refund/confirm", - "style": { - "navigationBarTitleText": "申请退款", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "refund/detail", - "style": { - "navigationBarTitleText": "退款详情", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "refund/select", - "style": { - "navigationBarTitleText": "选择服务类型", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "refund/goods/index", - "style": { - "navigationBarTitleText": "退货退款", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "refund/list", - "style": { - "navigationBarTitleText": "退货列表", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "refund/logistics", - "style": { - "navigationBarTitleText": "物流信息", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "browsingHistory/index", - "style": { - "navigationBarTitleText": "浏览记录", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "distributor/index", - "style": { - "navigationBarTitleText": "成为分销", - "backgroundColor": "#FFFFFF" - } - }, - { - "path": "user_invoice_list/index", - "style": { - "navigationBarTitleText": "发票管理" - } - }, - { - "path": "user_invoice_form/index", - "style": { - "navigationBarTitleText": "添加新发票" - } - }, - { - "path": "user_invoicing/index", - "style": { - "navigationBarTitleText": "开具发票" - } - }, - { - "path": "user_invoice_order/index", - "style": { - "navigationBarTitleText": "订单详情" - } - }, - { - "path": "user_invoice_Finance/index", - "style": { - "navigationBarTitleText": "财务公开" - } - }, - { - "path": "user_invoice_order_list/index", - "style": { - "navigationBarTitleText": "财务详情" - } - }, - { - "path": "privacy/index", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, { - "path": "embody/embody", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] - }, - { - "root": "pages/store", - "name": "store", - "pages": [{ - "path": "index", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "navigationBarTitleText": "店铺diy首页" - // #ifdef MP - , - "navigationBarTextStyle": "#FFFFFF" - // #endif - } - }, { - "path": "home/index", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "店铺首页" - // #ifdef MP - , - "navigationBarTextStyle": "#FFFFFF" - // #endif - } - }, - { - "path": "detail/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "店铺详情" - } - }, - { - "path": "list/index", - "style": { - "navigationBarTitleText": "商品列表" - } - }, - { - "path": "settled/index", - "style": { - "navigationBarTitleText": "商家入驻" - } - }, { - "path": "applicationRecord/index", - "style": { - "navigationBarTitleText": "申请记录" - } - }, { - "path": "merchantDetails/index", - "style": { - "navigationBarTitleText": "审核通过" - } - }, - { - "path": "shopStreet/index", - "style": { - "navigationBarTitleText": "店铺街" - } - }, - { - "path": "qualifications/index", - "style": { - "navigationBarTitleText": "店铺资质信息" - } - }, { - "path": "settledApply/settledApply", - "style": { - "navigationBarTitleText": "入驻申请", - "enablePullDownRefresh": true - } - - }, { - "path": "entryProcess/entryProcess", - "style": { - "navigationBarTitleText": "入驻流程", - "enablePullDownRefresh": false - } - - } - ] - }, - { - "root": "pages/admin", - "name": "adminOrder", - "pages": [{ - "path": "order/index", - "style": { - "navigationBarTitleText": "订单首页" - } - }, - { - "path": "orderList/index", - "style": { - "navigationBarTitleText": "订单列表" - } - }, - { - "path": "orderRefund/index", - "style": { - "navigationBarTitleText": "立即退款" - } - }, - { - "path": "business/index", - "style": { - "navigationBarTitleText": "商家管理" - } - }, - { - "path": "orderDetail/index", - "style": { - "navigationBarTitleText": "订单详情" - } - }, - { - "path": "refundDetail/index", - "style": { - "navigationBarTitleText": "退款单详情" - } - }, - { - "path": "delivery/index", - "style": { - "navigationBarTitleText": "订单发货" - } - }, - { - "path": "statistics/index", - "style": { - "navigationBarTitleText": "订单数据统计" - } - }, - { - "path": "order_cancellation/index", - "style": { - "navigationBarTitleText": "订单核销" - } - }, - { - "path": "cancellate_result/index", - "style": { - "navigationBarTitleText": "核销结果" - } - }, - { - "path": "goods_details/index", - "style": { - "navigationBarTitleText": "商品详情" - - } - }, { - "path": "stockOut/index", - "style": { - "navigationBarTitleText": "扫码出库", - "enablePullDownRefresh": false - } - - } - ] - }, - { - "root": "pages/product", - "name": "product", - "pages": [{ - "path": "list/index", - "style": { - "navigationBarTitleText": "商品管理", - "enablePullDownRefresh": true - } - }, - { - "path": "goodsOnSale/index", - "style": { - "onReachBottomDistance": 100, - "navigationBarTitleText": "在售商品", - "enablePullDownRefresh": false - } - }, - { - "path": "soldOutGoods/index", - "style": { - "onReachBottomDistance": 100, - "navigationBarTitleText": "售罄商品", - "enablePullDownRefresh": false - } - }, - { - "path": "recycleBin/index", - "style": { - "onReachBottomDistance": 100, - "navigationBarTitleText": "回收站", - "enablePullDownRefresh": false - } - }, - { - "path": "storeClassification/index", - "style": { - "navigationBarTitleText": "店铺分类" - } - }, - { - "path": "storeClassification/addStoreClass", - "style": { - "navigationBarTitleText": "添加店铺分类" - } - }, - { - "path": "addGoods/index", - "style": { - "navigationBarTitleText": "添加商品" - } - }, - { - "path": "addGoods/secound", - "style": { - "navigationBarTitleText": "添加商品" - } - }, - { - "path": "addGoods/addGoodDetils", - "style": { - "navigationBarTitleText": "商品详情" - } - }, - { - "path": "addGoods/singleSpecification", - "style": { - "navigationBarTitleText": "单规格" - } - }, - { - "path": "addGoods/mulSpecification", - "style": { - "navigationBarTitleText": "多规格" - } - }, - { - "path": "addGoods/specificationProperties", - "style": { - "navigationBarTitleText": "规格属性" - } - }, - { - "path": "addGoods/freightTemplate", - "style": { - "navigationBarTitleText": "运费模板", - "onReachBottomDistance": 100, - "enablePullDownRefresh": false - } - }, - { - "path": "addGoods/addFreightTemplate", - "style": { - "navigationBarTitleText": "新增运费模板" - } - }, - { - "path": "addGoods/modifyPrice", - "style": { - "navigationBarTitleText": "修改价格-多规格" - } - }, - { - "path": "basicSet", - "style": { - "navigationBarTitleText": "商户基本设置", - "enablePullDownRefresh": false - } - } - ] - }, - { - "root": "pages/plantGrass", - "name": "plant_grass", - "pages": [{ - "path": "plant_detail/index", - "style": { - "navigationBarTitleText": "内容详情" - } - }, - { - "path": "plant_release/index", - "style": { - "navigationBarTitleText": "内容发布", - "enablePullDownRefresh":true - } - }, - { - "path": "plant_show/index", - "style": { - "navigationBarTitleText": "种草秀" - } - }, - { - "path": "plant_topic/index", - "style": { - "navigationBarTitleText": "话题筛选" - } - }, - { - "path": "plant_search/index", - "style": { - "navigationBarTitleText": "搜索" - } - }, - { - "path": "plant_search_list/index", - "style": { - "navigationBarTitleText": "搜索结果" - } - }, - { - "path": "plant_featured/index", - "style": { - "navigationBarTitleText": "为你精选" - } - }, - { - "path": "plant_user/index", - "style": { - "navigationBarTitleText": "个人主页" - } - }, - { - "path": "plant_user_attention/index", - "style": { - "navigationBarTitleText": "我的关注" - } - }, - { - "path": "plant_user_fans/index", - "style": { - "navigationBarTitleText": "我的粉丝" - } - } - - ] - }, - { - "root": "pages/columnGoods", - "name": "columnGoods", - "pages": [{ - "path": "HotNewGoods/index", - "style": { - "navigationBarTitleText": "精品推荐" - } - }, - { - "path": "goods_list/index", - "style": { - "navigationBarTitleText": "商品列表" - } - }, - { - "path": "goods_coupon_list/index", - "style": { - "navigationBarTitleText": "优惠券商品" - } - }, - { - "path": "goods_search/index", - "style": { - "navigationBarTitleText": "搜索商品" - } - }, - { - "path": "goods_search_con/index", - "style": { - "navigationBarTitleText": "搜索商品" - } - } - ] - // "plugins": { - // "live-player-plugin": { - // "version": "1.3.2", - // "provider": "wx2b03c6e691cd7370" - // } - // } - }, - { - "root": "pages/chat", - "name": "chat", - "pages": [{ - "path": "customer_list/index", - "style": { - "navigationBarTitleText": "消息中心" - } - }, - { - "path": "customer_list/chat", - "style": { - "navigationBarTitleText": "客服聊天" - } - }, - { - "path": "customer_login/index", - "style": { - "navigationBarTitleText": "客服登录" - } - }, - { - "path": "customer_info/index", - "style": { - "navigationBarTitleText": "客户信息" - } - } - ] - }, - { - "root": "pages/activity", - "name": "activity", - "pages": [{ - "path": "goods_seckill/index", - "style": { - "navigationBarTitleText": "限时秒杀", - "navigationBarBackgroundColor": "#F2F2F2" - } - }, - { - "path": "goods_seckill_details/index", - "style": { - "navigationBarTitleText": "秒杀详情", - "navigationStyle": "custom" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "liveBroadcast/index", - "style": { - "navigationBarTitleText": "直播列表", - "navigationBarBackgroundColor": "#F2F2F2" - } - }, - { - "path": "presell/index", - "style": { - "navigationBarTitleText": "预售列表" - // #ifdef MP || APP-PLUS - , - "navigationBarBackgroundColor": "#F2F2F2" - // #endif - } - }, - { - "path": "presell_details/index", - "style": { - "navigationStyle": "custom" - // #ifdef MP || APP-PLUS - , - "navigationBarTextStyle": "#fff" - // #endif - } - }, - { - "path": "combination/index", - "style": { - "navigationBarTitleText": "拼团" - // #ifdef MP || APP-PLUS - , - "navigationBarBackgroundColor": "#F2F2F2" - // #endif - } - }, - { - "path": "combination_details/index", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "拼团详情", - "navigationBarBackgroundColor": "#F2F2F2" - } - }, - { - "path": "combination_status/index", - "style": { - "navigationBarTitleText": "拼团状态" - } - }, - { - "path": "assist/index", - "style": { - "navigationBarTitleText": "助力列表", - "navigationBarBackgroundColor": "#F2F2F2" - } - }, - { - "path": "assist_detail/index", - "style": { - "navigationBarTitleText": "发起助力" - } - }, - { - "path": "assist_record/index", - "style": { - "navigationBarTitleText": "助力记录" - } - }, - { - "path": "topic/index", - "style": { - "navigationBarTitleText": "活动专场" - } - }, - { - "path": "topic_detail/index", - "style": { - "navigationBarTitleText": "主题活动" - } - }, - { - "path": "lifeService/index", - "style": { - "navigationBarTitleText": "本地服务" - } - }, - { - "path": "collect_coupons/index", - "style": { - "navigationBarTitleText": "领劵中心" - } - }, - { - "path": "rank/index", - "style": { - "navigationBarTitleText": "热卖排行" - } - } - ] - }, - { - "root": "pages/short_video", - "name": "shortVideo", - "pages": [{ - "navigationBarTitleText": "短视频", - "enablePullDownRefresh": false, - //#ifdef APP - "path": "appSwiper/index", - //#endif - //#ifndef APP - "path": "nvueSwiper/index", - //#endif - "style": { - "navigationBarTitleText": "社区短视频", - "navigationStyle": "custom", - "app-plus": { - "titleNView": false, - "bounce": "none" - } - } - - }] - }, - { - "root": "pages/annex", - "name": "annx", - "pages": [{ - "path": "web_view/index", - "style": { - "navigationBarTitleText": "", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, { - "path": "vip_paid/index", - "style": { - "navigationBarTitleText": "开通会员", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, { - "path": "vip_center/index", - "style": { - "navigationBarTitleText": "会员中心", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, - { - "path": "vip_grade/index", - "style": { - "navigationBarTitleText": "会员卡", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#302F35", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, - { - "path": "vip_clause/index", - "style": { - "navigationBarTitleText": "会员协议", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - } - - ] + ,{ + "path": "uni_modules/guyue-updater/pages/updater", + "style": { + "app-plus": { + "animationDuration": 200, + "animationType": "fade-in", + "background": "transparent", + "backgroundColorTop": "transparent", + "bounce": "none", + "popGesture": "none", + "scrollIndicator": false, + "titleNView": false + }, + "backgroundColor": "transparent", + "disableScroll": true, + "navigationStyle": "custom" } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "加载中...", - "navigationBarBackgroundColor": "#fff", - "backgroundColor": "#F8F8F8" - //#ifndef H5 - , - "titleNView": true - //#endif - //#ifdef H5 - , - "titleNView": false - //#endif - }, - "tabBar": { - "color": "#282828", - "selectedColor": "#E93323", - "borderStyle": "white", - "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/index/index", - "iconPath": "static/tabbar_icon/a.png", - "selectedIconPath": "static/tabbar_icon/a-a.png", - "text": "泸州" - }, - { - "pagePath": "pages/gather/gather", - "iconPath": "static/tabbar_icon/b.png", - "selectedIconPath": "static/tabbar_icon/b-a.png", - "text": "工作台" - }, - { - "pagePath": "pages/plant_release/index", - "iconPath": "static/tabbar_icon/d.png", - "selectedIconPath": "static/tabbar_icon/d-a.png", - "text": "发布" - }, - { - "pagePath": "pages/supply_chains/supply_chains", - "iconPath": "static/tabbar_icon/c.png", - "selectedIconPath": "static/tabbar_icon/c-a.png", - "text": "供应" - }, - { - "pagePath": "pages/user/index", - "iconPath": "static/tabbar_icon/e.png", - "selectedIconPath": "static/tabbar_icon/e-a.png", - "text": "我的" - } - ] - }, - "condition": { //模式配置，仅开发期间生效 - "current": 0, //当前激活的模式(list 的索引项) - "list": [{ - "name": "", //模式名称 - "path": "", //启动页面，必选 - "query": "" //启动参数，在页面的onLoad函数里面得到 - }] - }, - "sitemapLocation": "sitemap.json" +} +], + "subPackages": [{ + "root": "pages/goods_cate", + "name": "goods_cate", + "pages": [{ + "path": "goods_cate", + "style": { + "navigationBarTitleText": "商品分类" + } + }] + }, + { + "root": "pages/goods_details", + "name": "goods_details", + "pages": [{ + "path": "index", + "style": { + "navigationStyle": "custom" + // #ifdef MP || APP-PLUS + , + "navigationBarTextStyle": "#fff" + // #endif + } + }] + }, + { + "root": "pages/order_details", + "name": "order_details", + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "订单详情" + //, + //"navigationBarBackgroundColor": "#e93323" + // #ifdef MP || APP-PLUS + // , + //"navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "stay", + "style": { + "navigationBarTitleText": "订单详情" + //, + //"navigationBarBackgroundColor": "#e93323" + // #ifdef MP || APP-PLUS + // , + //"navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "delivery", + "style": { + "navigationBarTitleText": "配送详情" + //, + //"navigationBarBackgroundColor": "#e93323" + // #ifdef MP || APP-PLUS + // , + //"navigationBarTextStyle": "#fff" + // #endif + } + } + ] + }, + { + "root": "pages/nongKe", + "name": "nongKe", + "pages": [{ + "path": "gather/select_warehouse", + "style": { + "navigationBarTitleText": "入库管理", + "enablePullDownRefresh": true + } + }, { + "path": "goods_list/index", + "style": { + "enablePullDownRefresh": true, + "navigationStyle": "custom" + + } + }, + { + "path": "supply_chain/goods_list", + "style": { + "navigationBarTitleText": "商品列表", + "enablePullDownRefresh": true + } + + }, { + "path": "supply_chain/finance", + "style": { + "navigationBarTitleText": "财务管理", + "enablePullDownRefresh": false + } + + }, { + "path": "supply_chain/supplier", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#e93323", + "navigationStyle": "custom" + } + + }, { + "path": "supply_chain/supplierA", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#e93323", + "navigationStyle": "custom" + } + + }, + { + "path": "supply_chain/suppliers", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#e93323", + "navigationStyle": "custom" + } + + }, { + "path": "supply_chain/maps", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#e93323", + "navigationStyle": "custom" + } + + }, { + "path": "supply_chain/merchant", + "style": { + "navigationBarTitleText": "商品", + "enablePullDownRefresh": false + } + + }, { + "path": "supply_chain/purchase_control", + "style": { + "navigationBarTitleText": "进货管理", + "enablePullDownRefresh": false + } + + }, { + "path": "supply_chain/shopping_trolley", + "style": { + "navigationBarTitleText": "购物车", + "enablePullDownRefresh": false + } + + }, { + "path": "cloud_entrepot/index", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "里海云仓", + "enablePullDownRefresh": true + } + + }, { + "path": "teach_video/teach_video", + "style": { + "navigationBarTitleText": "教学视频", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "specialty/index", + "style": { + "navigationBarTitleText": "名优特产", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "specialty/indexa", + "style": { + "navigationBarTitleText": "名优特产", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "food/index", + "style": { + "navigationBarTitleText": "当地美食", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "food/indexa", + "style": { + "navigationBarTitleText": "当地美食", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "tourism/index", + "style": { + "navigationBarTitleText": "特色文旅", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "tourism/indexa", + "style": { + "navigationBarTitleText": "特色文旅", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + } + ] + }, + { + "root": "pages/users", + "name": "users", + "pages": [{ + "path": "retrievePassword/index", + "style": { + "navigationBarTitleText": "忘记密码" + } + }, + { + "path": "online_warehousing/index", + "style": { + "navigationBarTitleText": "采购订单" + } + }, + { + "path": "user_setting/index", + "style": { + "navigationBarTitleText": "设置" + } + }, + { + "path": "supply_procurement/index", + "style": { + "navigationBarTitleText": "供货采购" + } + }, + //协议，关于 + { + "path": "user_about/index", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "agreement_rules/index", + "style": { + "navigationBarTitleText": "协议规则" + } + }, + { + "path": "user_info/index", + "style": { + "navigationBarTitleText": "个人资料" + } + }, + { + "path": "user_nickname/index", + "style": { + "navigationBarTitleText": "昵称" + } + }, + { + "path": "user_get_coupon/index", + "style": { + "navigationBarTitleText": "领取优惠券" + } + }, + { + "path": "user_goods_collection/index", + "style": { + "navigationBarTitleText": "我的收藏" + } + }, + { + "path": "user_sgin/index", + "style": { + "navigationBarTitleText": "签到" + } + }, + { + "path": "user_sgin_list/index", + "style": { + "navigationBarTitleText": "签到记录" + } + }, + { + "path": "user_money/index", + "style": { + "navigationBarTitleText": "我的账户" + } + }, + { + "path": "user_bill/index", + "style": { + "navigationBarTitleText": "账单明细" + } + }, + { + "path": "user_integral/index", + "style": { + "navigationBarTitleText": "积分详情" + } + }, + { + "path": "user_brokerage/index", + "style": { + "navigationBarTitleText": "分销等级" + } + }, + { + "path": "user_grade/index", + "style": { + "navigationBarTitleText": "我的等级", + "navigationBarBackgroundColor": "#282828" + // #ifdef MP || APP-PLUS + , + "navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "user_grade_list/index", + "style": { + "navigationBarTitleText": "成长值记录", + "navigationBarBackgroundColor": "#282828" + // #ifdef MP || APP-PLUS + , + "navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "user_coupon/index", + "style": { + "navigationBarTitleText": "我的优惠券" + } + }, + { + "path": "user_spread_user/index", + "style": { + "navigationBarTitleText": "我的推广" + } + }, + { + "path": "user_spread_code/index", + "style": { + "navigationBarTitleText": "分销海报" + } + }, + { + "path": "user_spread_money/index", + "style": { + "navigationBarTitleText": "佣金记录" + } + }, + { + "path": "user_cash/index", + "style": { + "navigationBarTitleText": "提现" + } + }, + { + "path": "gather_list/index", + "style": { + "navigationBarTitleText": "提现流水" + } + }, + { + "path": "user_address_list/index", + "style": { + "navigationBarTitleText": "地址管理" + } + }, + { + "path": "user_address/index", + "style": { + "navigationBarTitleText": "添加地址" + } + }, + { + "path": "user_phone/index", + "style": { + "navigationBarTitleText": "绑定手机" + } + }, + { + "path": "user_modify_phone/index", + "style": { + "navigationBarTitleText": "修改手机号" + } + }, + { + "path": "user_modify_pwd/index", + "style": { + "navigationBarTitleText": "修改密码" + } + }, + { + "path": "user_payment/index", + "style": { + "navigationBarTitleText": "余额充值" + } + }, + { + "path": "user_pwd_edit/index", + "style": { + "navigationBarTitleText": "修改密码" + // #ifdef MP || APP-PLUS + , + "navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "order_confirm/index", + "style": { + "navigationBarTitleText": "提交订单" + } + }, + { + "path": "goods_details_store/index", + "style": { + "navigationBarTitleText": "门店列表" + } + }, + { + "path": "promoter-list/index", + "style": { + "navigationBarTitleText": "推广人列表" + } + }, + { + "path": "promoter-order/index", + "style": { + "navigationBarTitleText": "推广人订单" + } + }, + { + "path": "promoter_rank/index", + "style": { + "navigationBarTitleText": "推广人排行" + } + }, + { + "path": "commission_rank/index", + "style": { + "navigationBarTitleText": "佣金排行" + } + }, + { + "path": "order_list/index", + "style": { + "navigationBarTitleText": "我的订单" + } + }, + { + "path": "order_list/indexCopy", + "style": { + "navigationBarTitleText": "采购订单" + } + }, + { + "path": "order_list/relase", + "style": { + "navigationBarTitleText": "委托订单" + } + }, + { + "path": "order_list/order", + "style": { + "navigationBarTitleText": "我的订单" + } + }, + { + "path": "order_list/search", + "style": { + "navigationBarTitleText": "我的订单" + } + }, + { + "path": "presell_order_list/index", + "style": { + "navigationBarTitleText": "预售订单" + } + }, + { + "path": "goods_logistics/index", + "style": { + "navigationBarTitleText": "物流信息" + } + }, + { + "path": "user_return_list/index", + "style": { + "navigationBarTitleText": "退货列表" + } + }, + { + "path": "goods_return/index", + "style": { + "navigationBarTitleText": "申请退货" + } + }, + { + "path": "login/login_copy", + "style": { + "navigationBarTitleText": "登录", + "navigationBarBackgroundColor": "#EB5447", + "navigationStyle": "custom" + // #ifdef MP || APP-PLUS + , + "navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "goods_comment_list/index", + "style": { + "navigationBarTitleText": "商品评分" + } + }, + { + "path": "goods_comment_con/index", + "style": { + "navigationBarTitleText": "商品评价" + } + }, + { + "path": "feedback/index", + "style": { + "navigationBarTitleText": "问题反馈", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "feedback/list", + "style": { + "navigationBarTitleText": "反馈记录", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "feedback/detail", + "style": { + "navigationBarTitleText": "反馈内容", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "refund/index", + "style": { + "navigationBarTitleText": "批量退款", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "refund/confirm", + "style": { + "navigationBarTitleText": "申请退款", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "refund/detail", + "style": { + "navigationBarTitleText": "退款详情", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "refund/select", + "style": { + "navigationBarTitleText": "选择服务类型", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "refund/goods/index", + "style": { + "navigationBarTitleText": "退货退款", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "refund/list", + "style": { + "navigationBarTitleText": "退货列表", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "refund/logistics", + "style": { + "navigationBarTitleText": "物流信息", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "browsingHistory/index", + "style": { + "navigationBarTitleText": "浏览记录", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "distributor/index", + "style": { + "navigationBarTitleText": "成为分销", + "backgroundColor": "#FFFFFF" + } + }, + { + "path": "user_invoice_list/index", + "style": { + "navigationBarTitleText": "发票管理" + } + }, + { + "path": "user_invoice_form/index", + "style": { + "navigationBarTitleText": "添加新发票" + } + }, + { + "path": "user_invoicing/index", + "style": { + "navigationBarTitleText": "开具发票" + } + }, + { + "path": "user_invoice_order/index", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "user_invoice_Finance/index", + "style": { + "navigationBarTitleText": "财务公开" + } + }, + { + "path": "user_invoice_order_list/index", + "style": { + "navigationBarTitleText": "财务详情" + } + }, + { + "path": "privacy/index", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, { + "path": "embody/embody", + "style": { + "navigationBarTitleText": "提现", + "enablePullDownRefresh": false + } + + }, { + "path": "payment/payment", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, { + "path": "trading_hall/index", + "style": { + "navigationBarTitleText": "交易大厅", + "enablePullDownRefresh": false + } + + } + ] + }, + { + "root": "pages/releaseManagement", + "name": "releaseManagement", + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "发布管理", + "enablePullDownRefresh": false + } + + }, + { + "path": "details/index", + "style": { + "navigationBarTitleText": "发起委托", + "enablePullDownRefresh": false + } + + } + ] + }, + { + "root": "pages/commissionedSales", + "name": "commissionedSales", + "pages": [{ + "path": "index/index", + "style": { + "navigationBarTitleText": "委托销售", + "enablePullDownRefresh": false + } + + }, + { + "path": "initiateDelegation/index", + "style": { + "navigationBarTitleText": "发起委托", + "enablePullDownRefresh": false + } + + }, + { + "path": "addDelegation/index", + "style": { + "navigationBarTitleText": "新增委托", + "enablePullDownRefresh": false + } + + }, + { + "path": "receivedCommission/index", + "style": { + "navigationBarTitleText": "收到委托", + "enablePullDownRefresh": false + } + + }, + { + "path": "delegation_details/index", + "style": { + "navigationBarTitleText": "委托销售详情", + "enablePullDownRefresh": false + } + + } + ] + }, + { + "root": "pages/trading_hall", + "name": "trading_hall", + "pages": [ + + { + "path": "transfer_goods/index", + "style": { + "navigationBarTitleText": "新增调货", + "enablePullDownRefresh": false + } + + }, { + "path": "adddiscounts/index", + "style": { + "navigationBarTitleText": "新增打折", + "enablePullDownRefresh": false + } + + }, { + "path": "product_details/index", + "style": { + "navigationBarTitleText": "商品详情", + "enablePullDownRefresh": false + } + + } + + ] + }, + + { + "root": "pages/store", + "name": "store", + "pages": [{ + "path": "index", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "navigationBarTitleText": "店铺diy首页" + // #ifdef MP + , + "navigationBarTextStyle": "#FFFFFF" + // #endif + } + }, { + "path": "home/index", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "店铺首页" + // #ifdef MP + , + "navigationBarTextStyle": "#FFFFFF" + // #endif + } + }, + { + "path": "detail/index", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "店铺详情" + } + }, + { + "path": "list/index", + "style": { + "navigationBarTitleText": "商品列表" + } + }, + { + "path": "settled/index", + "style": { + "navigationBarTitleText": "商家入驻" + } + }, { + "path": "applicationRecord/index", + "style": { + "navigationBarTitleText": "申请记录" + } + }, { + "path": "merchantDetails/index", + "style": { + "navigationBarTitleText": "审核通过" + } + }, + { + "path": "shopStreet/index", + "style": { + "navigationBarTitleText": "店铺街" + } + }, + { + "path": "qualifications/index", + "style": { + "navigationBarTitleText": "店铺资质信息" + } + }, { + "path": "settledApply/settledApply", + "style": { + "navigationBarTitleText": "入驻申请", + "enablePullDownRefresh": true + } + + }, { + "path": "entryProcess/entryProcess", + "style": { + "navigationBarTitleText": "入驻流程", + "enablePullDownRefresh": false + } + + } + ] + }, + { + "root": "pages/admin", + "name": "adminOrder", + "pages": [{ + "path": "order/index", + "style": { + "navigationBarTitleText": "订单首页" + } + }, + { + "path": "orderList/index", + "style": { + "navigationBarTitleText": "订单列表" + } + }, { + "path": "financial_management/index", + "style": { + "navigationBarTitleText": "财务管理" + } + }, + + { + "path": "orderRefund/index", + "style": { + "navigationBarTitleText": "立即退款" + } + }, + { + "path": "business/index", + "style": { + "navigationBarTitleText": "商家管理" + } + }, + { + "path": "orderDetail/index", + "style": { + "navigationBarTitleText": "订单详情" + } + }, + { + "path": "refundDetail/index", + "style": { + "navigationBarTitleText": "退款单详情" + } + }, + { + "path": "delivery/index", + "style": { + "navigationBarTitleText": "订单发货" + } + }, + { + "path": "statistics/index", + "style": { + "navigationBarTitleText": "订单数据统计" + } + }, + { + "path": "order_cancellation/index", + "style": { + "navigationBarTitleText": "订单核销" + } + }, + { + "path": "cancellate_result/index", + "style": { + "navigationBarTitleText": "核销结果" + } + }, + { + "path": "goods_details/index", + "style": { + "navigationBarTitleText": "商品详情" + + } + }, { + "path": "stockOut/index", + "style": { + "navigationBarTitleText": "扫码出库", + "enablePullDownRefresh": false + } + + }, { + "path": "order/monitor", + "style": { + "navigationBarTitleText": "订单监控", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/product", + "name": "product", + "pages": [{ + "path": "list/index", + "style": { + "navigationBarTitleText": "商品管理", + "enablePullDownRefresh": true + } + }, + { + "path": "goodsOnSale/index", + "style": { + "onReachBottomDistance": 100, + "navigationBarTitleText": "在售商品", + "enablePullDownRefresh": false + } + }, + { + "path": "soldOutGoods/index", + "style": { + "onReachBottomDistance": 100, + "navigationBarTitleText": "售罄商品", + "enablePullDownRefresh": false + } + }, + { + "path": "recycleBin/index", + "style": { + "onReachBottomDistance": 100, + "navigationBarTitleText": "回收站", + "enablePullDownRefresh": false + } + }, + { + "path": "storeClassification/index", + "style": { + "navigationBarTitleText": "店铺分类" + } + }, + { + "path": "storeClassification/addStoreClass", + "style": { + "navigationBarTitleText": "添加店铺分类" + } + }, + { + "path": "addGoods/index", + "style": { + "navigationBarTitleText": "添加商品" + } + }, + { + "path": "addGoods/secound", + "style": { + "navigationBarTitleText": "添加商品" + } + }, + { + "path": "addGoods/addGoodDetils", + "style": { + "navigationBarTitleText": "商品详情" + } + }, + { + "path": "addGoods/singleSpecification", + "style": { + "navigationBarTitleText": "单规格" + } + }, + { + "path": "addGoods/mulSpecification", + "style": { + "navigationBarTitleText": "多规格" + } + }, + { + "path": "addGoods/specificationProperties", + "style": { + "navigationBarTitleText": "规格属性" + } + }, + { + "path": "addGoods/freightTemplate", + "style": { + "navigationBarTitleText": "运费模板", + "onReachBottomDistance": 100, + "enablePullDownRefresh": false + } + }, + { + "path": "addGoods/addFreightTemplate", + "style": { + "navigationBarTitleText": "新增运费模板" + } + }, + { + "path": "addGoods/modifyPrice", + "style": { + "navigationBarTitleText": "修改价格-多规格" + } + }, + { + "path": "basicSet", + "style": { + "navigationBarTitleText": "商户基本设置", + "enablePullDownRefresh": false + } + } + ] + }, + { + "root": "pages/plantGrass", + "name": "plant_grass", + "pages": [{ + "path": "plant_detail/index", + "style": { + "navigationBarTitleText": "内容详情" + } + }, + { + "path": "plant_release/index", + "style": { + "navigationBarTitleText": "内容发布", + "enablePullDownRefresh": false + } + }, + { + "path": "plant_show/index", + "style": { + "navigationBarTitleText": "种草秀" + } + }, + { + "path": "plant_topic/index", + "style": { + "navigationBarTitleText": "话题筛选" + } + }, + { + "path": "plant_search/index", + "style": { + "navigationBarTitleText": "搜索" + } + }, + { + "path": "plant_search_list/index", + "style": { + "navigationBarTitleText": "搜索结果" + } + }, + { + "path": "plant_featured/index", + "style": { + "navigationBarTitleText": "为你精选" + } + }, + { + "path": "plant_user/index", + "style": { + "navigationBarTitleText": "个人主页" + } + }, + { + "path": "plant_user_attention/index", + "style": { + "navigationBarTitleText": "我的关注" + } + }, + { + "path": "plant_user_fans/index", + "style": { + "navigationBarTitleText": "我的粉丝" + } + } + + ] + }, + { + "root": "pages/columnGoods", + "name": "columnGoods", + "pages": [{ + "path": "HotNewGoods/index", + "style": { + "navigationBarTitleText": "精品推荐" + } + }, + { + "path": "goods_list/index", + "style": { + "navigationBarTitleText": "商品列表" + } + }, + { + "path": "goods_coupon_list/index", + "style": { + "navigationBarTitleText": "优惠券商品" + } + }, + { + "path": "goods_search/index", + "style": { + "navigationBarTitleText": "搜索商品" + + } + }, + { + "path": "goods_search_con/index", + "style": { + "navigationBarTitleText": "搜索商品", + "app-plus": { + "titleNView": false + } + } + } + ] + // "plugins": { + // "live-player-plugin": { + // "version": "1.3.2", + // "provider": "wx2b03c6e691cd7370" + // } + // } + }, + { + "root": "pages/chat", + "name": "chat", + "pages": [{ + "path": "customer_list/index", + "style": { + "navigationBarTitleText": "消息中心" + } + }, + { + "path": "customer_list/chat", + "style": { + "navigationBarTitleText": "客服聊天" + } + }, + { + "path": "customer_login/index", + "style": { + "navigationBarTitleText": "客服登录" + } + }, + { + "path": "customer_info/index", + "style": { + "navigationBarTitleText": "客户信息" + } + } + ] + }, + { + "root": "pages/activity", + "name": "activity", + "pages": [{ + "path": "goods_seckill/index", + "style": { + "navigationBarTitleText": "限时秒杀", + "navigationBarBackgroundColor": "#F2F2F2" + } + }, + { + "path": "goods_seckill_details/index", + "style": { + "navigationBarTitleText": "秒杀详情", + "navigationStyle": "custom" + // #ifdef MP || APP-PLUS + , + "navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "liveBroadcast/index", + "style": { + "navigationBarTitleText": "直播列表", + "navigationBarBackgroundColor": "#F2F2F2" + } + }, + { + "path": "presell/index", + "style": { + "navigationBarTitleText": "预售列表" + // #ifdef MP || APP-PLUS + , + "navigationBarBackgroundColor": "#F2F2F2" + // #endif + } + }, + { + "path": "presell_details/index", + "style": { + "navigationStyle": "custom" + // #ifdef MP || APP-PLUS + , + "navigationBarTextStyle": "#fff" + // #endif + } + }, + { + "path": "combination/index", + "style": { + "navigationBarTitleText": "拼团" + // #ifdef MP || APP-PLUS + , + "navigationBarBackgroundColor": "#F2F2F2" + // #endif + } + }, + { + "path": "combination_details/index", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "拼团详情", + "navigationBarBackgroundColor": "#F2F2F2" + } + }, + { + "path": "combination_status/index", + "style": { + "navigationBarTitleText": "拼团状态" + } + }, + { + "path": "assist/index", + "style": { + "navigationBarTitleText": "助力列表", + "navigationBarBackgroundColor": "#F2F2F2" + } + }, + { + "path": "assist_detail/index", + "style": { + "navigationBarTitleText": "发起助力" + } + }, + { + "path": "assist_record/index", + "style": { + "navigationBarTitleText": "助力记录" + } + }, + { + "path": "topic/index", + "style": { + "navigationBarTitleText": "活动专场" + } + }, + { + "path": "topic_detail/index", + "style": { + "navigationBarTitleText": "主题活动" + } + }, + { + "path": "lifeService/index", + "style": { + "navigationBarTitleText": "本地服务" + } + }, + { + "path": "collect_coupons/index", + "style": { + "navigationBarTitleText": "领劵中心" + } + }, + { + "path": "rank/index", + "style": { + "navigationBarTitleText": "热卖排行" + } + } + ] + }, + { + "root": "pages/short_video", + "name": "shortVideo", + "pages": [{ + "navigationBarTitleText": "短视频", + "enablePullDownRefresh": false, + //#ifdef APP + "path": "appSwiper/index", + //#endif + //#ifndef APP + "path": "nvueSwiper/index", + //#endif + "style": { + "navigationBarTitleText": "社区视频", + "navigationStyle": "custom", + "app-plus": { + "titleNView": false, + + "bounce": "none" + } + } + + }] + }, + { + "root": "pages/annex", + "name": "annx", + "pages": [{ + "path": "web_view/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { + "path": "vip_paid/index", + "style": { + "navigationBarTitleText": "开通会员", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { + "path": "vip_center/index", + "style": { + "navigationBarTitleText": "会员中心", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "vip_grade/index", + "style": { + "navigationBarTitleText": "会员卡", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#302F35", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "vip_clause/index", + "style": { + "navigationBarTitleText": "会员协议", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + } + + ] + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "加载中...", + "navigationBarBackgroundColor": "#fff", + "backgroundColor": "#F8F8F8" + //#ifndef H5 + , + "titleNView": true + //#endif + //#ifdef H5 + , + "titleNView": false + //#endif + }, + "tabBar": { + "color": "#282828", + "selectedColor": "#E93323", + "borderStyle": "white", + "backgroundColor": "#ffffff", + + "list": [{ + "pagePath": "pages/index/index", + "iconPath": "static/tabbar_icon/a.png", + "selectedIconPath": "static/tabbar_icon/a-a.png", + "text": "泸州" + + }, + { + "pagePath": "pages/gather/gather", + "iconPath": "static/tabbar_icon/b.png", + "selectedIconPath": "static/tabbar_icon/b-a.png", + "text": "工作台" + }, + { + "pagePath": "pages/plant_release/index", + "iconPath": "static/tabbar_icon/c.png", + "selectedIconPath": "static/tabbar_icon/c-a.png", + "text": "发布" + + }, + { + "pagePath": "pages/supply_chains/supply_chains", + + "iconPath": "static/tabbar_icon/d.png", + "selectedIconPath": "static/tabbar_icon/d-a.png", + "text": "供应" + }, + { + "pagePath": "pages/user/index", + "iconPath": "static/tabbar_icon/e.png", + "selectedIconPath": "static/tabbar_icon/e-a.png", + "text": "我的" + } + ] + + + + + }, + "condition": { //模式配置，仅开发期间生效 + "current": 0, //当前激活的模式(list 的索引项) + "list": [{ + "name": "", //模式名称 + "path": "", //启动页面，必选 + "query": "" //启动参数，在页面的onLoad函数里面得到 + }] + }, + "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue index b84ce84..e69de29 100644 --- a/pages/activity/combination_details/index.vue +++ b/pages/activity/combination_details/index.vue @@ -1,1969 +0,0 @@ - - - diff --git a/pages/activity/lifeService/index.vue b/pages/activity/lifeService/index.vue index 44d38b9..ec938a5 100644 --- a/pages/activity/lifeService/index.vue +++ b/pages/activity/lifeService/index.vue @@ -280,6 +280,7 @@ // console.log(res) this.detaile_address = res.data.address; this.recommend_address = res.data.address.length > 4 ? res.data.address.slice(0,4) + '...' : res.data.address + uni.setStorageSync('adress_location',res.data.address) }) }, fail: (res) => { diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue index 506c7d8..9387d8a 100644 --- a/pages/admin/order/index.vue +++ b/pages/admin/order/index.vue @@ -1,348 +1,577 @@ - \ No newline at end of file diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index bee21b1..4d4d325 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -86,7 +86,7 @@ 支付方式： - {{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }} + {{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "先货后款" }} 买家留言： @@ -146,8 +146,14 @@ - + + + 同意 + + + 拒绝 + 一键改价 @@ -158,11 +164,24 @@ 确认付款 - 去发货 + + + 收件码 + + 去发货 去核销 + + + 请把二维码展示给取货人员 + + + + + + \ No newline at end of file diff --git a/pages/chat/customer_list/chat.vue b/pages/chat/customer_list/chat.vue index f0408ef..40a218e 100644 --- a/pages/chat/customer_list/chat.vue +++ b/pages/chat/customer_list/chat.vue @@ -789,6 +789,7 @@ +
@@ -1944,6 +1945,7 @@ position: fixed; bottom: 0; left: 0; + margin-bottom: var(--status-bar-height);; } .broadcast-details .footerCon.on { diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue index 3d663eb..4442f82 100644 --- a/pages/columnGoods/goods_search/index.vue +++ b/pages/columnGoods/goods_search/index.vue @@ -158,9 +158,9 @@ } else { this.$set(this, 'searchValue', event); } - this.$nextTick(() => { - this.focus = true - }) + // this.$nextTick(() => { + // this.focus = true + // }) this.searchBut() }, setValue: function(event) { diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue index 6e93048..27e017d 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -2,19 +2,17 @@ - - - + @@ -22,7 +20,7 @@ 店铺 - + {{downMenu[downKey].title}} @@ -413,7 +411,7 @@ } } }); - this.mTop = this.hide_mer_status == 0 ? '238rpx' : '170rpx' + this.mTop = this.hide_mer_status == 0 ? '308rpx' : '170rpx' }, computed: { shopTab: function() { @@ -561,9 +559,10 @@ limit: this.sotreParam.limit, order: this.sotreParam.order, category_id: this.sotreParam.category_id, - type_id: 10 + type_id: this.sotreParam.type_id } + console.log(this.sotreParam.category_id) if (this.latitude) { serachData.location = this.latitude + ',' + this.longitude } @@ -578,7 +577,7 @@ this.storeList = this.storeList.concat(res.data.list) this.count = res.data.count this.loading = false - console.log(this.storeList); + }) }, // 店铺排序 @@ -684,6 +683,7 @@ }, // 组件确定 confirm2(data) { + let arr1 = [], arr2 = [] if (data.storeTypeArr.length == 0) { @@ -821,8 +821,10 @@ //查找产品 get_product_list: function(isPage) { let that = this; + if (that.loadend) return; if (that.loading) return; + if (isPage === true) that.$set(that, 'productList', []); that.loading = true; that.loadTitle = ''; @@ -897,13 +899,14 @@ .productList .search { width: 100%; - height: 86rpx; - padding: 0 20rpx; - box-sizing: border-box; - position: fixed; - left: 0; - top: 0; - z-index: 9; + height: 170rpx; + padding: 0 20rpx; + // box-sizing: border-box; + position: fixed; + left: 0; + top: 0rpx; + padding-top: 60rpx; + z-index: 9; background-color: var(--view-theme); .icon-dingwei { @@ -966,7 +969,7 @@ z-index: 9; position: fixed; left: 0; - top: 0; + top: 70rpx; width: 100%; margin-top: 86rpx; background-color: var(--view-theme); @@ -1040,6 +1043,7 @@ .productList .list { padding: 0 20rpx; + } .productList .list.on { @@ -1075,6 +1079,7 @@ position: relative; width: 100%; height: 345rpx; + } .productList .list .item .pictrue.on { @@ -1417,7 +1422,8 @@ } .store-wrapper { - margin-top: 240rpx; + margin-top: 310rpx; + border-top: 1px solid #F6F6F6; .star-box { diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 87c764a..e8fbae7 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -1,216 +1,94 @@ \ No newline at end of file diff --git a/pages/index/component/pictureCube.vue b/pages/index/component/pictureCube.vue index 6538d07..5840f27 100644 --- a/pages/index/component/pictureCube.vue +++ b/pages/index/component/pictureCube.vue @@ -28,7 +28,7 @@ - + diff --git a/pages/index/index.vue b/pages/index/index.vue index 478e22c..3fbc553 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,394 +1,1151 @@ - \ No newline at end of file diff --git a/pages/news_details/index.vue b/pages/news_details/index.vue index 63b9c5b..d1ccac2 100644 --- a/pages/news_details/index.vue +++ b/pages/news_details/index.vue @@ -1,269 +1,352 @@ \ No newline at end of file diff --git a/pages/news_list/index.vue b/pages/news_list/index.vue index a03bd95..255639e 100644 --- a/pages/news_list/index.vue +++ b/pages/news_list/index.vue @@ -1,339 +1,352 @@ \ No newline at end of file diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index ec30a2f..a04503e 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -1,142 +1,1020 @@ - \ No newline at end of file diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue index 498460b..7a03a32 100644 --- a/pages/nongKe/gather/select_warehouse.vue +++ b/pages/nongKe/gather/select_warehouse.vue @@ -1,736 +1,737 @@ \ No newline at end of file diff --git a/pages/nongKe/goods_list/index.vue b/pages/nongKe/goods_list/index.vue index 31033ee..29b320f 100644 --- a/pages/nongKe/goods_list/index.vue +++ b/pages/nongKe/goods_list/index.vue @@ -1,1008 +1,1023 @@ \ No newline at end of file diff --git a/pages/nongKe/supply_chain/component/shop_card.vue b/pages/nongKe/supply_chain/component/shop_card.vue index 21c6271..cec9e10 100644 --- a/pages/nongKe/supply_chain/component/shop_card.vue +++ b/pages/nongKe/supply_chain/component/shop_card.vue @@ -11,7 +11,7 @@ {{ store_item.street_name }} {{ store_item.mer_name }} - + {{ store_item.product_score }}分 @@ -32,7 +32,7 @@ - + {{itemn.store_name}} ￥{{itemn.price}} diff --git a/pages/nongKe/supply_chain/goods_list.vue b/pages/nongKe/supply_chain/goods_list.vue index 43a20d5..cda2a3d 100644 --- a/pages/nongKe/supply_chain/goods_list.vue +++ b/pages/nongKe/supply_chain/goods_list.vue @@ -1,334 +1,358 @@ - \ No newline at end of file diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue index 5027e61..e137b68 100644 --- a/pages/nongKe/supply_chain/merchant.vue +++ b/pages/nongKe/supply_chain/merchant.vue @@ -20,7 +20,7 @@ - + {{ item.store_name }} @@ -41,6 +41,35 @@ 采购清单 + + +

颜色规格

+ + + + + + {{item.sku}} + 库存: {{item.stock}} + + + + - + + + + + + + + + + @@ -52,6 +81,9 @@ } from '@/api/store.js' import { Toast } from '@/libs/uniApi' import goodsPopup from '../cpns/goodsPopup.vue' + import { + changeCartNum + } from '@/api/order.js'; export default { components: { goodsPopup @@ -88,7 +120,16 @@ }, id: '', order: true, - num: '' + num: '', + show: false, + scrollTop: 0, + attrValue: [], + Image: '', + goods: [{ + cart_num: 0 + }], + goodsLite: {}, + goodsindexL: '' } }, onLoad(e) { @@ -176,23 +217,27 @@ * 获取产品详情 */ getGoodsDetails(item) { - // console.log('e,item',e,item); - // let that = this; - // const count = e.value - // getProductDetail(item.product_id).then(res => { - // const unique = Object.values(res.data.sku)[0].unique - // console.log(res.data.product_id, count, unique,'123123'); - // that.goCat(res.data.product_id, count, unique) - // }) - let that = this; - const count = '1' - // console.log(111); - getProductDetail(item.product_id, { product_type: 98 }).then(res => { - const unique = Object.values(res.data.sku)[0].unique - that.goCat(res.data.product_id, count, unique) - }).catch(err => { - Toast(err) - }) + console.log(item); + if (item.product.attrValue.length == 1) { + let that = this; + const count = '1' + getProductDetail(item.product_id, { product_type: 98 }).then(res => { + const unique = Object.values(res.data.sku)[0].unique + that.goCat(res.data.product_id, count, unique) + }).catch(err => { + Toast(err) + }) + } else { + this.show = true + this.attrValue = item.product.attrValue + this.Image = item.image + for (let i = 1; i < item.product.attrValue.length; i++) { + this.goods.push({ + cart_num: 0 + }) + } + } + }, /* * 加入购物车 @@ -220,7 +265,96 @@ }); }); }, + close() { + this.show = false + }, + //购物车增加 + addCart(item, index) { + let that = this + that.goods[index].cart_num = that.goods[index].cart_num + 1 + that.goods.numAdd = true + that.goodsLite = item + that.goodsindexL = index + let q = { + is_new: 0, + product_id: that.goodsLite.product_id, + cart_num: that.goods[that.goodsindexL].cart_num, + product_attr_unique: that.goodsLite.unique, + // source: this.source, + product_type: 98, + spread_id: '' + }; + postCartAdd(q).then(res => { + that.$util.Tips({ + title: "添加购物车成功", + }); + }) + .catch(res => { + this.show = false + return that.$util.Tips({ + title: res + }); + }); + }, + subCart(item, index) { + let that = this + if (that.goods[index].cart_num == 0) { + return + } else { + that.goods[index].cart_num = that.goods[index].cart_num - 1 + that.goods.numAdd = true + that.goodsLite = item + that.goodsindexL = index + let q = { + is_new: 0, + product_id: that.goodsLite.product_id, + cart_num: that.goods[that.goodsindexL].cart_num, + product_attr_unique: that.goodsLite.unique, + // source: this.source, + product_type: 98, + spread_id: '' + }; + postCartAdd(q).then(res => { + that.$util.Tips({ + title: "添加购物车成功", + }); + }) + .catch(res => { + this.show = false + return that.$util.Tips({ + title: res + }); + }); + } + }, + addshopcart() { + console.log(this.goodsLite); + console.log(this.goodsindexL); + this.show = false + // let that = this + // let q = { + // is_new: 0, + // product_id: that.goodsLite.product_id, + // cart_num: that.goods[that.goodsindexL].cart_num, + // product_attr_unique: that.goodsLite.unique, + // // source: this.source, + // product_type: 98, + // spread_id: '' + // }; + // postCartAdd(q).then(res => { + // this.show = false + // that.$util.Tips({ + // title: "添加购物车成功", + // }); + // }) + // .catch(res => { + // this.show = false + // return that.$util.Tips({ + // title: res + // }); + // }); + } }, onReachBottom() { //如果状态为nomore 则不能在触发上拉事件 @@ -395,4 +529,91 @@ background-color: $uni-theme-color; color: #fff; } + + .scroll-Y { + height: 50vh; + width: 90%; + margin: auto; + + } + + .scroll-view-item { + font-size: 36rpx; + border-bottom: 1px solid #ccc; + + .scroll_item_top { + height: 60px; + display: flex; + justify-content: flex-start; + align-items: center; + + image { + width: 50px; + height: 50px; + margin: 5px; + } + + .text { + width: 200px; + height: 60px; + float: left; + + view { + height: 30px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + + text { + color: #F84221; + } + } + } + } + + .scroll_item_bon { + width: 100%; + height: 40px; + display: flex; + justify-content: flex-end; + align-items: center; + + .reduce { + width: 30px; + height: 30px; + text-align: center; + color: #BDC4CE; + background: #EEEEEE; + } + + input { + width: 50px; + height: 30px; + text-align: center; + } + + .plus { + width: 30px; + text-align: center; + height: 30px; + color: #FFFFFF; + background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); + } + + .on { + background-color: #e3e3e3; + color: #dedede; + } + + } + } + + .btn { + width: 100%; + height: 50px; + background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); + border-radius: 24px 24px 24px 24px; + line-height: 50px; + color: white; + } \ No newline at end of file diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue index fea09f7..20276af 100644 --- a/pages/nongKe/supply_chain/shopping_trolley.vue +++ b/pages/nongKe/supply_chain/shopping_trolley.vue @@ -242,6 +242,7 @@ currSku: '', newData: {}, activeRouter: '', + type_id:'' }; }, computed: configMap({ hide_mer_status: 1, recommend_switch: 0, navigation: {} }, mapGetters(['isLogin', @@ -348,7 +349,7 @@ this.cartList.valid.forEach(el => { el.list.forEach(goods => { if (goods.check) { - type_id.push(goods.spu.spu_id) + type_id.push(goods.product_id) } }) }) @@ -357,6 +358,8 @@ title: '请选择产品' }); } else { + + collectAll({ type_id: type_id, type: 1 @@ -568,7 +571,7 @@ }) if (selectValue.length > 0) { uni.navigateTo({ - url: '/pages/users/order_confirm/index?product_type=98&cartId=' + selectValue.join(',') + url: `/pages/users/order_confirm/index?product_type=98&cartId=${selectValue.join(',')}&type_id=12` }); } else { return this.$util.Tips({ @@ -578,12 +581,13 @@ }, // 购物车增加 addCart: function(goods, index) { + console.log(goods.cart_id); let that = this; changeCartNum(goods.cart_id, { cart_num: goods.cart_num + 1 }).then(res => { goods.cart_num = Number(goods.cart_num) + 1 - that.cartTotalCount = Number(that.cartTotalCount) + 1; + // that.cartTotalCount = Number(that.cartTotalCount) + 1; if (goods.hasOwnProperty('productAttr') && goods.cart_num > goods.productAttr.stock) { goods.cart_num = goods.productAttr.stock; goods.numAdd = true; @@ -649,7 +653,7 @@ goods.numSub = true; } goods.cart_num = Number(goods.cart_num) - 1 - this.cartTotalCount = Number(this.cartTotalCount) - 1; + // this.cartTotalCount = Number(this.cartTotalCount) - 1; this.cartAllCheck('goodsCheck') }).catch(error => { this.$util.Tips({ @@ -671,6 +675,7 @@ let that = this; getCartList({ product_type: 98 }).then(res => { // console.log("购物车", res) + this.type_id=res.data.list[0].type_id res.data.list.forEach((item, index) => { item.allCheck = true item.list.forEach((goods, j) => { diff --git a/pages/nongKe/supply_chain/supplier-copy.vue b/pages/nongKe/supply_chain/supplier-copy.vue index 2abb398..728e9ae 100644 --- a/pages/nongKe/supply_chain/supplier-copy.vue +++ b/pages/nongKe/supply_chain/supplier-copy.vue @@ -33,7 +33,7 @@ - + diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 2d45244..8e24527 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -1,26 +1,112 @@ - + \ No newline at end of file diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 94e9364..fd8c56e 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -4,30 +4,40 @@ - + {{ orderInfo.status == 11 ? '交易已关闭' : '待付尾款' }} - 请在{{orderInfo.orderProduct[0].cart_info.productPresell.final_end_time}}前完成支付,超时订单将自动取消 + + 请在{{orderInfo.orderProduct[0].cart_info.productPresell.final_end_time}}前完成支付,超时订单将自动取消 + - + + + + - 待发货 + 待发货 等待其他人参加拼团 - 待核销 - {{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}} - 待评价 - 已完成 + 待核销 + + {{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}} + + 待评价 + 已完成 已为您退款,感谢您的支持 {{orderInfo.pay_time}} @@ -36,23 +46,59 @@ - 待付款 - 待发货 - 待核销 - 待收货 - 待评价 - 已完成 + + 待付款 + 待发货 + 待核销 + 待收货 + + 待评价 + 已完成 - + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + @@ -63,7 +109,9 @@ - {{orderInfo.real_name}}{{orderInfo.user_phone}} + {{orderInfo.real_name}} + {{orderInfo.user_phone}} + {{orderInfo.user_address}} @@ -88,11 +136,13 @@ 营业时间 - 周一至周日： + 周一至周日： {{'周'+ toChinese(item)}}, - {{orderInfo.take.mer_take_time[0]}}-{{orderInfo.take.mer_take_time[1]}} + {{orderInfo.take.mer_take_time[0]}}-{{orderInfo.take.mer_take_time[1]}} @@ -103,16 +153,27 @@ - + {{orderInfo.merchant.mer_name}} - - - + + + + + + + + +
联系客服
@@ -148,7 +209,7 @@ 配送员未接单 查看详情 + :url="'/pages/order_details/delivery?orderId=' + orderInfo.order_id">查看详情 @@ -157,7 +218,8 @@ {{ orderInfo.remark }} - + + 订单编号： {{orderInfo.order_sn}} @@ -189,7 +251,9 @@ 支付方式： 余额支付 支付宝支付 - 微信支付 + 微信支付 + 先货后款 买家留言： @@ -198,11 +262,13 @@ - + {{index}}： {{item}} - + @@ -223,46 +289,103 @@ 实付款： ￥{{orderInfo.presell_price}} - - 实付款： - ￥{{orderInfo.pay_price}} + + + 实付款： + ￥{{orderInfo.pay_price}} + + + 结算周期到期后付款 ￥100.00 + + + + 结算周期:30天 日利率:0.05% + - 申请开票 - - {{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款 - 立即付款 - 取消订单 + + + + {{ orderInfo.presellOrder.final_start_time | filterDay }} 付尾款 + + + + 立即付款 + + 取消订单 + - 批量退款 + 批量退款 取消拼团 - 查看拼团 + + 取消订单 + + 立即付款 + + + + 查看拼团 - 批量退款 - 查看物流 - 确认收货 + + 查看物流 + + + + 确认收货 + + 确认收货 + + + + 取件码 + + + - 批量退款 - 查看物流 - 再次购买 + 批量退款 + 查看物流 + + + 再次购买 + + + 去结算 + + 删除订单 - 批量退款 - 再次购买 + 批量退款 + + + 再次购买 - + + + @@ -280,6 +403,31 @@ {{orderInfo.verify_code}} + + + + + + + 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在xx天xx小时后计息。 + + + + + + + + + +

确认收到货了吗?

+ 此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。 + + 取消 + + @@ -925,3 +641,644 @@ margin-right: 20rpx; } + \ No newline at end of file diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue index af9c930..a28f466 100644 --- a/pages/order_pay_status/index.vue +++ b/pages/order_pay_status/index.vue @@ -2,7 +2,7 @@ - + {{order_pay_info.paid == 1 ?'支付成功':'订单未支付'}} @@ -14,26 +14,30 @@ 支付方式 - 微信 - 支付宝 + 微信 + 支付宝 + 余额 支付金额 {{order_pay_info.pay_price}} - + 赠送积分 {{order_pay_info.give_integral}}个 - + 失败原因 {{order_pay_info.pay_type==0 ? '余额不足':msg}} - + - - + + @@ -53,12 +59,16 @@ - ￥{{item.coupon_price}} + + ￥{{item.coupon_price}} + {{item.title}} 满{{item.use_min_price}}元可用 - 有效期:{{ item.use_start_time |timeYMD }}-{{ item.use_end_time |timeYMD}} + + 有效期:{{ item.use_start_time |timeYMD }}-{{ item.use_end_time |timeYMD}} 领取后{{ item.coupon_time}}天内可用 @@ -88,22 +98,30 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- - import {getPayOrder} from '@/api/order.js'; - import {openOrderSubscribe} from '@/utils/SubscribeMessage.js'; - import {mapGetters} from "vuex"; + import { + getPayOrder + } from '@/api/order.js'; + import { + openOrderSubscribe + } from '@/utils/SubscribeMessage.js'; + import { + mapGetters + } from "vuex"; import authorize from '@/components/Authorize'; - import { HTTP_REQUEST_URL } from '@/config/app'; + import { + HTTP_REQUEST_URL + } from '@/config/app'; export default { components: { authorize, }, filters: { - timeYMD: function (value) { - if(value){ - var newDate=/\d{4}-\d{1,2}-\d{1,2}/g.exec(value) + timeYMD: function(value) { + if (value) { + var newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(value) return newDate[0] } - } + } }, data() { return { @@ -115,14 +133,16 @@ isShowAuth: false, //是否隐藏授权 status: 0, msg: '', - couponList:[], //优惠券列表 - isOpen:false ,//展开 + couponList: [], //优惠券列表 + isOpen: false, //展开 moneyBg: '/static/images/couponBg', text: '展开更多', - timer: null + timer: null, + product_type: '', + }; }, - computed: mapGetters(['isLogin','viewColor','keyColor']), + computed: mapGetters(['isLogin', 'viewColor', 'keyColor']), onLoad: function(options) { if (!options.order_id) return this.$util.Tips({ title: '缺少参数无法查看订单支付状态' @@ -134,21 +154,21 @@ this.order_type = options.order_type; this.status = options.status || 0; this.msg = options.msg || ''; + this.product_type = options.product_type if (this.isLogin) { this.refreshData(); } else { this.isAuto = true; this.isShowAuth = true - } + } }, methods: { - refreshData(){ - this.timer = setInterval(()=>{ - this.getOrderPayInfo(); - },1000) + refreshData() { + + this.getOrderPayInfo(); }, // 优惠券展开 - bindMore(){ + bindMore() { this.isOpen = !this.isOpen this.text = this.text == '展开更多' ? '收起' : '展开更多'; }, @@ -158,7 +178,7 @@ }, // 授权关闭 authColse: function(e) { - this.isShowAuth = e; + this.isShowAuth = e; }, /** * @@ -173,7 +193,7 @@ uni.setNavigationBarTitle({ title: res.data.paid == 1 ? '支付成功' : '支付失败' }); - if(res.data.paid == 1){ + if (res.data.paid == 1) { clearInterval(this.timer); this.timer = null; } @@ -199,16 +219,41 @@ * * 去订单详情页面 */ - goOrderDetails: function(e) { + goOrderDetails: function(val) { let that = this; - if (this.order_pay_info.paid == 0) { - uni.redirectTo({ - url: '/pages/users/order_list/index' - }) + if (this.product_type == 98) { + if(val==1){ + uni.navigateTo({ + url: `/pages/users/order_list/indexCopy?status=1&product_type=${this.product_type}` + }) + }else{ + uni.navigateTo({ + url: `/pages/users/order_list/indexCopy?status=0&product_type=${this.product_type}` + }) + } + + } else if (this.product_type == 99) { + if(val==1){ + uni.navigateTo({ + url: `/pages/users/order_list/relase?status=1&product_type=${this.product_type}` + }) + }else{ + uni.navigateTo({ + url: `/pages/users/order_list/relase?status=0&product_type=${this.product_type}` + }) + } + } else { - uni.redirectTo({ - url: '/pages/users/order_list/index?status=1' - }) + if(val==1){ + uni.navigateTo({ + url: '/pages/users/order_list/index?status=1&product_type=0' + }) + }else{ + uni.navigateTo({ + url: '/pages/users/order_list/index?status=0&product_type=0' + }) + } + } } @@ -231,6 +276,7 @@ border-radius: 10rpx; padding: 1rpx 0 28rpx 0; } + .payment-status .icon { font-size: 70rpx; width: 140rpx; @@ -242,19 +288,23 @@ border: 6rpx solid #f5f5f5; margin: -76rpx auto 0 auto; background-color: #999; - &.icon-duihao2{ + + &.icon-duihao2 { background-color: var(--view-theme); } } + .payment-status .icon.fail { text-shadow: 0px 4px 0px #7a7a7a; } + .payment-status .status { font-size: 32rpx; font-weight: bold; text-align: center; margin: 25rpx 0 37rpx 0; } + .payment-status .wrapper { border: 1px solid #eee; margin: 0 30rpx 47rpx 30rpx; @@ -262,16 +312,20 @@ border-left: 0; border-right: 0; } + .payment-status .wrapper .item { font-size: 28rpx; color: #282828; } + .payment-status .wrapper .item~.item { margin-top: 20rpx; } + .payment-status .wrapper .item .itemCom { color: #666; } + .payment-status .returnBnt { width: 630rpx; height: 86rpx; @@ -281,46 +335,56 @@ text-align: center; line-height: 86rpx; margin: 0 auto 20rpx auto; - &.gColor{ + + &.gColor { background-color: var(--view-theme); } - &.s-Color{ + + &.s-Color { color: var(--view-theme); - border: 1px solid var(--view-theme); + border: 1px solid var(--view-theme); } } + .t-color { - color: var(--view-theme)!important; + color: var(--view-theme) !important; } - .coupon-wrapper{ - .hd{ + + .coupon-wrapper { + .hd { display: flex; align-items: center; justify-content: center; margin: 30rpx 0; color: #999999; font-size: 24rpx; - .line{ + + .line { width: 70rpx; height: 1px; background: #DCDCDC; } - .txt{ + + .txt { margin: 0 20rpx; } } - .coupon-box{ + + .coupon-box { height: 356rpx; padding: 0 20rpx; overflow: hidden; - &.on{ + + &.on { height: auto; } - .coupon-item{ + + .coupon-item { width: 100%; margin-bottom: 20rpx; - box-shadow:0px 2px 10px 0px rgba(0, 0, 0, 0.06); - .left-bg{ + box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06); + + .left-bg { display: flex; align-items: center; justify-content: center; @@ -328,40 +392,46 @@ height: 160rpx; color: #fff; font-size: 64rpx; - text{ + + text { margin-top: 26rpx; font-size: 36rpx; } } - .info{ + + .info { display: flex; flex-direction: column; justify-content: space-between; margin-left: 20rpx; padding: 20rpx 0; - .title{ + + .title { color: #282828; font-size: 30rpx; } - .des{ + + .des { font-size: 24rpx; color: #999999; } } } } - .more{ + + .more { display: flex; align-items: center; justify-content: center; padding-top: 24rpx; font-size: 24rpx; color: #999999; - .iconfont{ + + .iconfont { margin-top: 6rpx; margin-left: 10rpx; font-size: 20rpx; } } } - + \ No newline at end of file diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue index 37d7269..d7a6d6f 100644 --- a/pages/plantGrass/plant_detail/index.vue +++ b/pages/plantGrass/plant_detail/index.vue @@ -1,40 +1,51 @@