diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index a9fc3b5..2537e0e 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -73,7 +73,7 @@ 退款中 x {{item.product_num - item.refund_num}} 已退款 x {{item.product_num - item.refund_num}} - 申请退款 + 申请退款 去评价 已评价 diff --git a/manifest.json b/manifest.json index 4499fe8..df8306c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.0.17", - "versionCode" : 140, + "versionName" : "1.0.18", + "versionCode" : 141, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index e218497..52240b6 100644 --- a/pages.json +++ b/pages.json @@ -227,18 +227,16 @@ "enablePullDownRefresh": false } + }, { + "path": "teach_video/teach_video", + "style": { + "navigationBarTitleText": "教学视频", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + } - ,{ - "path" : "teach_video/teach_video", - "style" : - { - "navigationBarTitleText": "教学视频", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - - } - ] + ] }, { "root": "pages/users", @@ -249,24 +247,24 @@ "navigationBarTitleText": "忘记密码" } }, - { - "path": "online_warehousing/index", - "style": { - "navigationBarTitleText": "采购订单" - } - }, + { + "path": "online_warehousing/index", + "style": { + "navigationBarTitleText": "采购订单" + } + }, { "path": "user_setting/index", "style": { "navigationBarTitleText": "设置" } }, - { - "path": "supply_procurement/index", - "style": { - "navigationBarTitleText": "供货采购" - } - }, + { + "path": "supply_procurement/index", + "style": { + "navigationBarTitleText": "供货采购" + } + }, //协议,关于 { "path": "user_about/index", @@ -392,12 +390,12 @@ "navigationBarTitleText": "提现" } }, - { - "path": "gather_list/index" , - "style": { - "navigationBarTitleText": "提现流水" - } - }, + { + "path": "gather_list/index", + "style": { + "navigationBarTitleText": "提现流水" + } + }, { "path": "user_address_list/index", "style": { @@ -486,12 +484,12 @@ "navigationBarTitleText": "我的订单" } }, - { - "path": "order_list/order", - "style": { - "navigationBarTitleText": "我的订单" - } - }, + { + "path": "order_list/order", + "style": { + "navigationBarTitleText": "我的订单" + } + }, { "path": "order_list/search", "style": { @@ -653,20 +651,20 @@ "style": { "navigationBarTitleText": "订单详情" } - }, - { - "path": "user_invoice_Finance/index", - "style": { - "navigationBarTitleText": "财务公开" - } - }, - { - "path": "user_invoice_order_list/index", - "style": { - "navigationBarTitleText": "财务详情" - } - }, - { + }, + { + "path": "user_invoice_Finance/index", + "style": { + "navigationBarTitleText": "财务公开" + } + }, + { + "path": "user_invoice_order_list/index", + "style": { + "navigationBarTitleText": "财务详情" + } + }, + { "path": "privacy/index", "style": { "navigationBarTitleText": "", @@ -679,17 +677,22 @@ "enablePullDownRefresh": false } + }, { + "path": "payment/payment", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + }, { + "path": "trading_hall/index", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } - ,{ - "path" : "payment/payment", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ] + ] }, { "root": "pages/store", @@ -698,7 +701,7 @@ "path": "index", "style": { "navigationStyle": "custom", - "enablePullDownRefresh": true, + "enablePullDownRefresh": true, "navigationBarTitleText": "店铺diy首页" // #ifdef MP , @@ -711,7 +714,7 @@ "navigationStyle": "custom", "navigationBarTitleText": "店铺首页" // #ifdef MP - , + , "navigationBarTextStyle": "#FFFFFF" // #endif } @@ -719,7 +722,7 @@ { "path": "detail/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": true, "navigationBarTitleText": "店铺详情" } }, diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index 1a8f5e8..0dd003f 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -148,6 +148,12 @@ + + 同意 + + + 拒绝 + 一键改价 @@ -249,6 +255,27 @@ }, methods: { + //同意先货后款订单 + tongyi(id,number){ + let data={ + id:id, + type:number + } + if(number == 1){ + this.$nextTick(()=>{ + this.where.status = 2; + delete this.where.is_verify; + this.init(); + }) + }else if(number == 2){ + uni.navigateTo({ + url:`/pages/admin/orderList/index?types=1&merId=${this.merId}` + }) + } + postconfirm(this.merId,data).then(res=>{ + console.log(res); + }) + }, more: function() { this.order = !this.order; }, diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index 9d66a4c..73daefd 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -130,15 +130,22 @@ - + 共{{ item.total_num }}件商品, 支付 ¥{{ item.pay_price }} (邮费 ¥{{ item.pay_postage}}) - - 共1件商品,结算周期到期后付款¥100 + + 先货后款 + + + 支付 + ¥{{ item.pay_price }} (邮费 ¥{{ item.pay_postage}}) + + + 共1件商品,结算周期到期后付款¥{{ item.pay_price }} @@ -147,7 +154,7 @@ 同意 - + 拒绝 diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 20b86c3..3f4c272 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -117,6 +117,21 @@ 商户设置 + + + + 交易大厅 + + + + + 委托销售 + + + + + 发布管理 + + + + + + + @@ -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,52 @@ }); }); }, - + close() { + this.show = false + }, + //购物车增加 + addCart(item, index) { + this.goods[index].cart_num = this.goods[index].cart_num + 1 + this.goods.numAdd = true + this.goodsLite = item + this.goodsindexL = index + }, + subCart(item, index){ + if( this.goods[index].cart_num == 0){ + return + }else{ + this.goods[index].cart_num = this.goods[index].cart_num - 1 + this.goods.numAdd = true + this.goodsLite = item + this.goodsindexL = index + } + }, + addshopcart() { + console.log(this.goodsLite); + console.log(this.goodsindexL); + 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 +485,86 @@ 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: 300px; + height: 60px; + float: left; + + view { + height: 30px; + + 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 d6fc4a6..6223186 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', @@ -568,7 +569,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=${this.type_id}` }); } else { return this.$util.Tips({ @@ -578,6 +579,7 @@ }, // 购物车增加 addCart: function(goods, index) { + console.log(goods.cart_id); let that = this; changeCartNum(goods.cart_id, { cart_num: goods.cart_num + 1 @@ -671,6 +673,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/order_details/index.vue b/pages/order_details/index.vue index e21e7d2..6b67399 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -302,8 +302,8 @@ 确认收货 - 批量退款 + 查看物流 @@ -351,6 +351,18 @@ + + + + + + +

确认收到货了吗?

+ 此订单为先货后款订单,确认收货后将开始计算结算周期。为保障售后权益,请检查后再确认收货。 + + 取消 +
+
+ + \ No newline at end of file diff --git a/static/images/diaohuo.png b/static/images/diaohuo.png new file mode 100644 index 0000000..132b867 Binary files /dev/null and b/static/images/diaohuo.png differ diff --git a/static/images/fabu.png b/static/images/fabu.png new file mode 100644 index 0000000..a71d25b Binary files /dev/null and b/static/images/fabu.png differ diff --git a/static/images/weituo.png b/static/images/weituo.png new file mode 100644 index 0000000..241aa0a Binary files /dev/null and b/static/images/weituo.png differ