diff --git a/.gitignore b/.gitignore index 0c44574..39ed041 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules /dist .hbuilderx +unpackage # local env files .env.local diff --git a/App.vue b/App.vue index 22bb76c..218deea 100644 --- a/App.vue +++ b/App.vue @@ -1,371 +1,426 @@ \ 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..b0c8f23 100644 --- a/api/api.js +++ b/api/api.js @@ -268,4 +268,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/order.js b/api/order.js index dc62d9e..6c8e3d7 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); } // 支付状态订单 diff --git a/api/product.js b/api/product.js index b820836..002e2d7 100644 --- a/api/product.js +++ b/api/product.js @@ -13,7 +13,12 @@ import request from "@/utils/request.js"; * 获取商品详情 */ export const getProductDetailsAPI = (data) => request.get('micro/product_details', 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/store.js b/api/store.js index 1ef4e99..0ffddca 100644 --- a/api/store.js +++ b/api/store.js @@ -467,7 +467,7 @@ export function getGeocoder(data) { * */ export function getStoreTypeApi() { - return request.get('intention/type', {}, { + return request.get('intention/type', {sift_store:1}, { noAuth: true }); } diff --git a/api/user.js b/api/user.js index e3700ea..7b806ed 100644 --- a/api/user.js +++ b/api/user.js @@ -707,4 +707,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/addressWindow/index.vue b/components/addressWindow/index.vue index 32a34a4..b5e74d4 100644 --- a/components/addressWindow/index.vue +++ b/components/addressWindow/index.vue @@ -1,16 +1,33 @@ \ No newline at end of file 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..98a33e0 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -2,11 +2,9 @@ - - @@ -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() { @@ -897,13 +895,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 +965,7 @@ z-index: 9; position: fixed; left: 0; - top: 0; + top: 70rpx; width: 100%; margin-top: 86rpx; background-color: var(--view-theme); @@ -1040,6 +1039,7 @@ .productList .list { padding: 0 20rpx; + } .productList .list.on { @@ -1075,6 +1075,7 @@ position: relative; width: 100%; height: 345rpx; + } .productList .list .item .pictrue.on { @@ -1417,7 +1418,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..0200a53 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -5,198 +5,226 @@ icon="http://cdn.uviewui.com/uview/empty/permission.png"> - - 市级供应链 - - - - 在售管理 - - - - 财务管理 - - - - - 入库管理 - - - - 商户设置 - - - - - 商品管理 - - - - - 提现管理 - - - - - 视频教学 - - - + - - - - 我的店铺 - - - - 供货采购 - - - - 进货管理 - - - - - 扫码出库 - - - - - 入库管理 - - - - - 提现管理 - + + + 我的店铺 + + + + + 供货采购 + + + + 进货管理 + + + + + 扫码出库 + + + + + 入库管理 + + + + + 提现管理 + - - - - 客服记录 - - - - - 订单核销 - - - - - 订单管理 - - - - - 商品管理 - - - - - 商户设置 - - - - - - - - - - - - - - 里海云仓 - - - - 供货采购 - - - - 进货管理 - - - - - 扫码出库 - - - - - 入库管理 - - - - - 提现管理 - - - - - - 客服记录 - - - - - 订单核销 - - - - - 订单管理 - - - - - 商品管理 - - - - - 商户设置 - - + + + + + + + + + + + + 里海云仓 + + + + 供货采购 + + + + 进货管理 + + + + + 扫码出库 + + + + + 入库管理 + + + + + 提现管理 + + + + + + 客服记录 + + + + + 订单核销 + + + + + 订单管理 + + + + + 商品管理 + + + + + 商户设置 + + + + - + + + + + + + \ No newline at end of file diff --git a/pages/news_details/index.vue b/pages/news_details/index.vue index 63b9c5b..88212e7 100644 --- a/pages/news_details/index.vue +++ b/pages/news_details/index.vue @@ -33,7 +33,7 @@ - + @@ -57,12 +57,22 @@ } from '@/api/api.js'; import shareInfo from '@/components/shareInfo'; import home from '@/components/home'; + import UniShare from 'uni_modules/uni-share/js_sdk/uni-share.js'; + const uniShare = new UniShare(); export default { components: { shareInfo, home, "jyf-parser": parser, }, + onBackPress({from}) { + if(from=='backbutton'){ + this.$nextTick(function(){ + uniShare.hide() + }) + return uniShare.isShow; + } + }, data() { return { id: 0, @@ -96,6 +106,78 @@ this.getArticleOne(); }, methods: { + // 分享 + uniShare() { + uniShare.show({ + content: { //公共的分享参数配置 类型（type）、链接（herf）、标题（title）、summary（描述）、imageUrl（缩略图） + type: 0, + href: 'https://uniapp.dcloud.io/', + title: '标题', + summary: '描述', + imageUrl: 'https://img-cdn-aliyun.dcloud.net.cn/stream/icon/__UNI__HelloUniApp.png' + }, + menus: [{ + "img": "/static/app-plus/sharemenu/wechatfriend.png", + "text": "微信好友", + "share": { //当前项的分享参数配置。可覆盖公共的配置如下：分享到微信小程序，配置了type=5 + "provider": "weixin", + "scene": "WXSceneSession" + } + }, + { + "img": "/static/app-plus/sharemenu/wechatmoments.png", + "text": "微信朋友圈", + "share": { + "provider": "weixin", + "scene": "WXSceneTimeline" + } + }, + { + "img": "/static/app-plus/sharemenu/mp_weixin.png", + "text": "微信小程序", + "share": { + provider: "weixin", + scene: "WXSceneSession", + type: 5, + miniProgram: { + id: '123', + path: '/pages/list/detail', + webUrl: '/#/pages/list/detail', + type: 0 + }, + } + }, + { + "img": "/static/app-plus/sharemenu/weibo.png", + "text": "微博", + "share": { + "provider": "sinaweibo" + } + }, + { + "img": "/static/app-plus/sharemenu/qq.png", + "text": "QQ", + "share": { + "provider": "qq" + } + }, + { + "img": "/static/app-plus/sharemenu/copyurl.png", + "text": "复制", + "share": "copyurl" + }, + { + "img": "/static/app-plus/sharemenu/more.png", + "text": "更多", + "share": "shareSystem" + } + ], + cancelText: "取消分享", + }, e => { //callback + console.log(uniShare.isShow); + console.log(e); + }) + }, getArticleOne: function() { let that = this; getArticleDetails(that.id).then(res => { diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index ec30a2f..68dfa8f 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -1,142 +1,161 @@ \ 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..62b4c50 100644 --- a/pages/nongKe/goods_list/index.vue +++ b/pages/nongKe/goods_list/index.vue @@ -1,1008 +1,1021 @@ \ No newline at end of file diff --git a/pages/nongKe/supply_chain/goods_list.vue b/pages/nongKe/supply_chain/goods_list.vue index 43a20d5..9dc0c5b 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..b7e13a5 100644 --- a/pages/nongKe/supply_chain/merchant.vue +++ b/pages/nongKe/supply_chain/merchant.vue @@ -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.vue b/pages/nongKe/supply_chain/supplier.vue index 2d45244..171da9a 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -1,58 +1,132 @@ @@ -222,6 +298,21 @@ }, data() { return { + tabLists: [{ + name: '默认', + order: '' + }, { + name: '销量', + order: 'sales' + }, { + name: '好评', + order: 'rate' + }, + { + name: '距离', + order: 'location' + } + ], price: 0, stock: 0, nows: false, @@ -239,27 +330,27 @@ downKey: 0, downStatus: false, // 下拉菜单 - downMenu: [{ - title: '默认', - key: 0, - order: "" - }, - { - title: '销量', - key: 1, - order: 'sales' - }, - { - title: '好评', - key: 2, - order: 'rate' - }, - { - title: '距离', - key: 3, - order: 'location' - } - ], + // downMenu: [{ + // title: '默认', + // key: 0, + // order: "" + // }, + // { + // title: '销量', + // key: 1, + // order: 'sales' + // }, + // { + // title: '好评', + // key: 2, + // order: 'rate' + // }, + // { + // title: '距离', + // key: 3, + // order: 'location' + // } + // ], // 是否第一个 firstKey: 0, // 商铺列表 @@ -288,16 +379,19 @@ storeTypeArr: [], //店铺类型 merList: [], //商户分类 product_type: 0, - show:false, - image: '' //图片 + show: false, + image: '', //图片, + credit_buy: '', //支持先货后款 }; }, onLoad(options) { - console.log(options); + + this.product_type = options.product_type ?? 0 if (options.street_id != undefined) { this.sotreParam.street_id = options.street_id } + this.credit_buy = options.credit_buy this.sotreParam.type_id = options.type_id this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || '' this.sotreParam.category_id = options.cate_id && options.cate_id.split(',').toString() || '' @@ -340,6 +434,10 @@ }) } }, + sectionChange(e) { + // console.log(e) + this.set_where(e.index) + }, // 获取商户分类 getClassfication: function() { let temp = [] @@ -496,7 +594,8 @@ order: this.sotreParam.order, category_id: this.sotreParam.category_id, type_id: this.sotreParam.type_id, - street_id: this.sotreParam.street_id + street_id: this.sotreParam.street_id, + credit_buy: this.credit_buy } if (this.latitude) { rqData.location = this.latitude + ',' + this.longitude @@ -524,8 +623,9 @@ } }, searchSubmit: function(e) { - let that = this; - that.$set(that.sotreParam, 'keyword', e.detail.value); + + // let that = this; + // this.$set(that.sotreParam, 'keyword', e.detail.value); this.set_where(this.firstKey) }, // 右侧切换 @@ -570,7 +670,7 @@ this.storeList = [] this.firstKey = e this.sotreParam.page = 1 - this.sotreParam.order = this.downMenu[e].order + this.sotreParam.order = this.tabLists[e].order this.storeMerchantList(); }, backjJump() { @@ -613,20 +713,41 @@ this.storeMerchantList() } } - + } - + \ No newline at end of file diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 94e9364..45d7415 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -4,20 +4,25 @@ - + {{ orderInfo.status == 11 ? '交易已关闭' : '待付尾款' }} - 请在{{orderInfo.orderProduct[0].cart_info.productPresell.final_end_time}}前完成支付,超时订单将自动取消 + + 请在{{orderInfo.orderProduct[0].cart_info.productPresell.final_end_time}}前完成支付,超时订单将自动取消 + - + + @@ -25,7 +30,8 @@ 待发货 等待其他人参加拼团 待核销 - {{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}} + {{orderInfo.is_virtual == 1 ? '服务商品已虚拟发货' : '待收货'}} + 待评价 已完成 已为您退款,感谢您的支持 @@ -37,8 +43,10 @@ 待付款 - 待发货 - 待核销 + 待发货 + 待核销 待收货 待评价 已完成 @@ -46,13 +54,24 @@ - - - - - - - + + + + + + + + + + + + @@ -63,7 +82,9 @@ - {{orderInfo.real_name}}{{orderInfo.user_phone}} + {{orderInfo.real_name}} + {{orderInfo.user_phone}} + {{orderInfo.user_address}} @@ -88,11 +109,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 +126,27 @@ - + {{orderInfo.merchant.mer_name}} - - - + + + + + + + + +
联系客服
@@ -148,7 +182,7 @@ 配送员未接单 查看详情 + :url="'/pages/order_details/delivery?orderId=' + orderInfo.order_id">查看详情 @@ -157,7 +191,8 @@ {{ orderInfo.remark }} - + + 订单编号： {{orderInfo.order_sn}} @@ -189,7 +224,9 @@ 支付方式： 余额支付 支付宝支付 - 微信支付 + 微信支付 + 先货后款 买家留言： @@ -198,11 +235,13 @@ - + {{index}}： {{item}} - + @@ -223,46 +262,76 @@ 实付款： ￥{{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 +349,31 @@ {{orderInfo.verify_code}} + + + + + + + 下单时实付￥0，确认收货后将开始计算结算周期，结算周期内按照订单金额付款。如未在结算周期内付款平台将在xx天xx小时后计息。 + + + + + + + + + +

确认收到货了吗?

+ 此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。 + + 取消 + + @@ -925,3 +639,651 @@ 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..71d610f 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,30 @@ * * 去订单详情页面 */ - 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 { - 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 +265,7 @@ border-radius: 10rpx; padding: 1rpx 0 28rpx 0; } + .payment-status .icon { font-size: 70rpx; width: 140rpx; @@ -242,19 +277,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 +301,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 +324,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 +381,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_release/index.vue b/pages/plantGrass/plant_release/index.vue index 6919eaf..b84512c 100644 --- a/pages/plantGrass/plant_release/index.vue +++ b/pages/plantGrass/plant_release/index.vue @@ -2,7 +2,8 @@
- + + {{item.name}} @@ -467,6 +468,7 @@ }); } }else{ + if (value.image.length == 0) return that.$util.Tips({ title: '请添加话题图片' }); diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue index 7b601ae..45d2a94 100644 --- a/pages/plant_release/index.vue +++ b/pages/plant_release/index.vue @@ -1,932 +1,990 @@ \ No newline at end of file diff --git a/pages/product/addGoods/modifyPrice.vue b/pages/product/addGoods/modifyPrice.vue index 15e097b..b85d292 100644 --- a/pages/product/addGoods/modifyPrice.vue +++ b/pages/product/addGoods/modifyPrice.vue @@ -39,11 +39,6 @@ - - 库存 - - - 商品编号 @@ -112,12 +107,6 @@ 原价 - - - 库存 - - - 展开 @@ -182,7 +171,6 @@ export default { price: '', //售价 cost: '', // 成本价 ot_price: '', // 原价 - stock: '', // 库存 bar_code: '', // 商品编号 weight: '', // 重量 volume: '', // 体积 @@ -363,7 +351,6 @@ export default { price: 0, cost: 0, ot_price: 0, - stock: 0, bar_code: '', weight: 0, volume: 0, @@ -397,7 +384,6 @@ export default { price: 0, cost: 0, ot_price: 0, - stock: 0, bar_code: '', weight: 0, volume: 0, diff --git a/pages/product/addGoods/secound.vue b/pages/product/addGoods/secound.vue index 49f6306..86c54c6 100644 --- a/pages/product/addGoods/secound.vue +++ b/pages/product/addGoods/secound.vue @@ -48,12 +48,41 @@ 商品视频 - + - + + + + + + + + + + + + + 点击可预览视频 + + + + + + + + 点击可预览视频 + + + + + + + + + @@ -63,7 +92,17 @@ + + + + + + + + + 上一步 提交 @@ -109,6 +148,7 @@ }, data() { return { + showVideo:false, disModel: false, upload_max: 10, uploadUrl: `${HTTP_REQUEST_URL}/api/upload/video`, @@ -144,6 +184,16 @@ } }, methods: { + videoshow() { + this.showVideo = true + this.videoContext = uni.createVideoContext('myVideo', this); + this.$nextTick(() => { + this.videoContext.play(); + }) + // this.video_link = this.formData.video_link; + // this.videoContext.requestFullScreen({ direction: 90 }); + // this.videoContext.play(); this.videoplay = true; + }, initData() { let editGoodsDetils = {}; if (getStorage('goodsDis')) { @@ -270,6 +320,8 @@ uni.chooseVideo({ sourceType: ['camera', 'album'], success: res => { + console.log(res) + if (Math.ceil(res.size / 1024) < this.upload_max * 1024) { uni.uploadFile({ url: this.uploadUrl, //仅为示例，非真实的接口地址 @@ -301,9 +353,11 @@ } }, fail: err => { - uni.showModal({ - content: JSON.stringify(err) - }); + // 取消上传也会出现弹框 + // uni.showModal({ + // content: JSON.stringify(err) + // }); + console.log(err) } }); }, @@ -357,7 +411,32 @@ } } } + .videoHover { + width: 180rpx; + height: 180rpx; + display: flex; + align-items: center; + justify-content: center; + position: absolute; + top: 0; + left: 0; + z-index: 10; + view { + width: 50rpx; + height: 50rpx; + background: #000000; + border-radius: 50rpx; + display: flex; + align-items: center; + justify-content: center; + + .iconfont { + color: #ffffff; + font-size: 21rpx; + } + } + } .photo { border: 1px solid #dddddd; opacity: 1; @@ -400,7 +479,10 @@ height: 150rpx; } } - +.preview_video{ + position: absolute; + +} .container_input { background: #fff; padding: 0 20rpx; @@ -519,7 +601,24 @@ .marginTop_none { margin-top: 0; } + .video-count { + position: fixed; + width: 600rpx; + height: 500rpx; + top: 50%; + left: 50%; + margin-left: -300rpx; + margin-top: -250rpx; + z-index: 100; + display: flex; + align-items: center; + justify-content: center; + .videoLink { + width: 600rpx; + height: 500rpx; + } + } // .writeBg { // background: #fff; // } diff --git a/pages/product/addGoods/singleSpecification.vue b/pages/product/addGoods/singleSpecification.vue index c2b45ac..5e2ed0f 100644 --- a/pages/product/addGoods/singleSpecification.vue +++ b/pages/product/addGoods/singleSpecification.vue @@ -26,7 +26,6 @@ price: '', // 售价 cost: '', // 成本价 ot_price: '', // 原价 - stock: '', // 库存 bar_code: '', // 商品编号 weight: '', // 重量 volume: '', // 体积 @@ -56,13 +55,6 @@ type: 'digit', holder: '请填写原价', model: 'ot_price' - }, - { - id: 4, - label: '库存', - type: 'number', - holder: '请填写库存', - model: 'stock' } ], moreThanList: [ diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index a6ac6d3..dac6331 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -1,132 +1,187 @@ - \ No newline at end of file diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 0bb656c..9b1edd8 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -9,27 +9,32 @@ - + + 添加商品 - + + 在售商品 - + + 售罄商品 - + + 回收站 - + + 店铺分类 @@ -38,7 +43,8 @@ - + + 运费模板 规格模板 + + + 商品导入 + @@ -75,28 +87,60 @@ ￥{{item.ot_price}} + + + + + + . . . + + - 下架 上架 编辑 - 预览 - 删除 + 删除 + {{item.is_good ? '取消推荐' : '店铺推荐'}} + + + + +

线下入库

+

线上入库

+ + + + + + + + + + + + 数量: + + + + + + + @@ -114,7 +158,8 @@ productLstApi, productDeleteApi, productOffApi, - productRecommendApi + productRecommendApi, + postImport } from "@/api/product"; import Loading from '@/components/Loading/index.vue'; import { @@ -145,6 +190,32 @@ productList: [], swiperCur: 0, circular: true, + attrValue: [], + options: [{ + value: '0', + text: '线上入库' + }, + { + value: '1', + text: '线下入库' + }, + { + value: '2', + text: '预览' + } + ], + //线下 + show: false, + //单选示例 + checkboxValue1: [], + // 基本案列数据 + checkboxList1: [], + data: { + product_id: '', + unique: "", + number: 1 + }, + on_line: '' } }, onLoad(options) { @@ -158,7 +229,95 @@ this.getList(this.mer_id); uni.stopPullDownRefresh() }, + onHide() { + this.show = false + }, methods: { + menuAction(action, rowId) { + // 忽略初始化时的传入的空操作 + if (action === '') { + return + } + this.on_line = action + this.checkboxList1 = rowId + console.log(this.on_line); + if (this.checkboxList1.length == 1 && action == 0) { + // this.show = true + navigateTo(1, '/pages/users/online_warehousing/index', { + mer_id: this.mer_id, + product_id: this.data.product_id, + unique: this.data.unique, + }); + } else if (this.checkboxList1.length == 1 && action == 1) { + this.show = true + this.data.product_id = this.checkboxList1[0].product_id + this.data.unique = this.checkboxList1[0].unique + console.log(this.data); + } else { + this.show = true + } + if (action == 2) { + uni.navigateTo({ + url: `/pages/admin/goods_details/index?product_id=${this.checkboxList1[0].product_id}&product_type=0` + }) + } + + }, + close() { + this.show = false + }, + //导入 + creat() { + if (this.on_line == 1) { + if (this.data.number < 1) { + this.show = false + this.$util.Tips({ + title: '入库数量不得小于一件' + }) + } else { + postImport(this.mer_id, this.data).then(res => { + console.log(res); + this.show = false + this.$util.Tips({ + title: res.message + }) + this.getList(this.mer_id); + }).catch(err => { + this.show = false + this.$util.Tips({ + title: '请选择规格后再次进行入库' + }) + }) + } + } + if (this.on_line == 0) { + console.log('12'); + if (!this.data.product_id) { + this.show = false + this.$util.Tips({ + title: '请选择规格' + }) + } else { + navigateTo(1, '/pages/users/online_warehousing/index', { + mer_id: this.mer_id, + product_id: this.data.product_id, + unique: this.data.unique, + + }); + } + + } + + }, + //规格 + checkboxChange(n) { + this.data.unique = n + console.log(n); + }, + radioChange(n) { + this.data.product_id = n.product_id + console.log(this.data); + }, // 跳转添加商品界面 jumpAddGoods() { const data = getStorage('addGoodsFormData'); @@ -172,11 +331,16 @@ } }) } - navigateTo(1, '/pages/product/addGoods/index', { mer_id: this.mer_id }); + navigateTo(1, '/pages/product/addGoods/index', { + mer_id: this.mer_id + }); }, // swiper swiperChange(e) { - let { current, source } = e.detail; + let { + current, + source + } = e.detail; if (source === 'touch') { //根据官方 source 来进行判断swiper的change事件是通过什么来触发的，autoplay是自动轮播。touch是用户手动滑动。其他的就是未知问题。抖动问题主要由于未知问题引起的，所以做了限制，只有在自动轮播和用户主动触发才去改变current值，达到规避了抖动bug this.swiperCur = e.detail.current; @@ -192,6 +356,7 @@ that.loaded = res.data.list.length < that.where.limit; that.productList.push.apply(that.productList, res.data.list); that.where.page = that.where.page + 1; + }, error => { that.$util.Tips({ @@ -217,7 +382,10 @@ removeStorage(item); } }); - navigateTo(1, '/pages/product/addGoods/index', { mer_id: item.mer_id, product_id: item.product_id }); + navigateTo(1, '/pages/product/addGoods/index', { + mer_id: item.mer_id, + product_id: item.product_id + }); }, handleRecycle(item, index) { let that = this; @@ -261,7 +429,9 @@ //上下架 onAndOff(item, status) { let that = this; - productOffApi(that.mer_id, item.product_id, { status: status }).then((res) => { + productOffApi(that.mer_id, item.product_id, { + status: status + }).then((res) => { that.$util.Tips({ title: res.message, icon: 'success' @@ -278,7 +448,9 @@ handleRecommend(item) { let that = this let is_good = item.is_good ? 0 : 1 - productRecommendApi(that.mer_id, item.product_id, { is_good: is_good }).then((res) => { + productRecommendApi(that.mer_id, item.product_id, { + is_good: is_good + }).then((res) => { that.$util.Tips({ title: res.message, icon: 'success' @@ -528,7 +700,7 @@ } .operation { - padding: 20upx 30upx; + padding: 20upx 10px; background: #ffffff; width: 100%; border-radius: 0 0 10rpx 10rpx; @@ -555,5 +727,91 @@ } } } + + .acea-row.row-between-wrapper { + justify-content: flex-end; + } + } + + .genduo { + display: flex; + justify-content: center; + align-items: center; + border: 1px solid #999999; + border-radius: 10px; + width: 30px; + height: 10px; + + .gen_sel { + font-size: 12px + } + } + + .popen { + position: absolute; + top: 110px; + width: 100%; + margin: auto; + padding: 10px; + z-index: 0; + + h4 { + font-weight: 400; + font-size: 20px; + padding: 5px; + text-align: center; + } + + .guige { + margin: 10px 0 10px 20px; + + .scroll_y { + max-height: 150px; + } + } + + .guiges { + height: 100px; + margin: 10px 0 10px 20px; + } + + .shuru { + display: flex; + justify-content: flex-start; + align-items: center; + padding: 5px; + margin-left: 20px; + + input { + background: #F5F5F5; + border-radius: 8px 8px 8px 8px; + border: 1px solid #999999; + padding-left: 3px; + margin-left: 3px; + } + + } + + .btn { + display: flex; + justify-content: flex-start; + align-items: center; + margin: 10px; + + .btn_l { + padding: 5px; + width: 100px; + border-radius: 4px; + } + + .btn_r { + width: 100px; + padding: 5px; + border-radius: 4px; + background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); + border-radius: 27px 27px 27px 27px; + color: white; + } + } } \ No newline at end of file diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index b2338d0..a8c726b 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -20,7 +20,7 @@ 】 --> - + 关注 @@ -257,6 +257,7 @@ {{item.count_start}} + @@ -1036,14 +1037,15 @@ /* #ifdef MP */ padding-top: 200rpx; /* #endif */ - background-color: #000000; + // background-color: #000000; + background-color: #F5F5F5; .goods_item { width: 342.11rpx; height: 491.23rpx; border-radius: 8px; overflow: hidden; - background-color: #000; + // background-color: #000; display: flex; flex-direction: column; padding-bottom: 10px; @@ -1170,11 +1172,11 @@ position: fixed; z-index: 9; width: 750rpx; - height: 86rpx; + height: 186rpx; flex-direction: row; justify-content: center; align-items: center; - top: 70rpx; + padding-top: 70rpx; .items { margin: 0 30rpx; @@ -1191,7 +1193,7 @@ } .container { - background-color: #000000; + background-color: #F5F5F5; } .item { diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue index ae8aa4a..3389670 100644 --- a/pages/short_video/nvueSwiper/index.nvue +++ b/pages/short_video/nvueSwiper/index.nvue @@ -13,7 +13,10 @@ --> - + + + + @@ -31,7 +34,18 @@ :vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false"> + + + + + + + - - + --> @@ -1135,10 +1154,11 @@ \ No newline at end of file diff --git a/pages/store/applicationRecord/index.vue b/pages/store/applicationRecord/index.vue index 9d49e46..7a7bc8f 100644 --- a/pages/store/applicationRecord/index.vue +++ b/pages/store/applicationRecord/index.vue @@ -5,14 +5,18 @@ {{item.mer_name}} 提交时间：{{item.create_time}} - 原因：{{item.fail_msg}} + - - - + + + + {{statusText(item.status)}} {{statusBtn(item.status)}} @@ -83,16 +87,17 @@ }, // 跳转逻辑 jump(item) { - // console.log(item) if ([0, 2].includes(item.status)) { + console.log(item) uni.navigateTo({ - url: `/pages/store/settled/index?mer_i_id=${item.mer_intention_id}` + url: `/pages/store/merchantDetails/fali?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}` }) } else if (item.status === 1) { uni.navigateTo({ url: `/pages/store/merchantDetails/index?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}` }) } + }, //状态判断 statusText(number) { @@ -108,9 +113,9 @@ statusBtn(number) { // 使用对象 let statusData = { - 0: "编辑", - 1: "查看", - 2: "重新提交", + 0: "", + 1: "查看详情", + 2: "查看详情", }; return statusData[number] }, @@ -125,76 +130,91 @@ align-items: center; background-color: #F5F5F5; padding: 20rpx 30rpx; + .card-list { width: 100%; background-color: #fff; padding: 20rpx 24rpx; margin: 10rpx 20rpx; border-radius: 12rpx; + .card-top { height: 140rpx; + .title { font-size: 28rpx; font-weight: bold; color: #333333; } + .time { color: #999999; font-size: 24rpx; padding: 5rpx 0; + margin-top: 10rpx; } + .reason { color: #E93323; font-weight: bold; font-size: 24rpx; } } + .line { height: 2rpx; margin: 20rpx 0 20rpx 0; background-color: #EEEEEE; } + .card-bottom { display: flex; justify-content: space-between; align-items: center; color: #333; + .card-status { display: flex; align-items: center; + .status-icon { - width: 30rpx; - height: 30rpx; + width: 50.82rpx; + height: 50.82rpx; margin: 10rpx; } + .status-text { font-size: 28rpx; font-weight: 500; } } + .status-btn { font-size: 26rpx; color: #555; - border: 1px solid #999999; + border: 1px solid #729FFA; padding: 8rpx 32rpx; border-radius: 40rpx; } } } } + .no-shop { width: 100%; background-color: #fff; height: 100vh; + .pictrue { display: flex; flex-direction: column; align-items: center; color: $uni-nothing-text; + image { width: 414rpx; height: 380rpx; } } } - + \ No newline at end of file diff --git a/pages/store/merchantDetails/index.vue b/pages/store/merchantDetails/index.vue index b45d881..5d4cff4 100644 --- a/pages/store/merchantDetails/index.vue +++ b/pages/store/merchantDetails/index.vue @@ -1,6 +1,65 @@ @@ -54,6 +109,11 @@ } }, methods: { + navgo(url) { + uni.navigateTo({ + url + }) + }, getGoodsDetails(id) { getGoodsDetails(id).then(res => { this.resData = res.data @@ -138,69 +198,100 @@ + \ No newline at end of file diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 0576694..f842abc 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -1,14 +1,25 @@