diff --git a/App.vue b/App.vue index 3d5f87d..d547ae6 100644 --- a/App.vue +++ b/App.vue @@ -1,6 +1,6 @@ + + \ No newline at end of file diff --git a/components/productWindow/newIndex.vue b/components/productWindow/newIndex.vue new file mode 100644 index 0000000..d59cbaf --- /dev/null +++ b/components/productWindow/newIndex.vue @@ -0,0 +1,466 @@ + + + + + \ No newline at end of file diff --git a/components/realselist/realselist.vue b/components/realselist/realselist.vue index afc7665..a402b21 100644 --- a/components/realselist/realselist.vue +++ b/components/realselist/realselist.vue @@ -159,23 +159,23 @@ checkedObj: { handler(n) { - this.checkedArr = JSON.parse(JSON.stringify(n||{})) + this.checkedArr = JSON.parse(JSON.stringify(n || {})) }, deep: true } }, mounted() { - this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj||{})) - this.aryys = JSON.parse(JSON.stringify(this.checkedObj||{})) + this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj || {})) + this.aryys = JSON.parse(JSON.stringify(this.checkedObj || {})) this.getBounht(); }, methods: { //价格 producrprice(e, i, item) { this.bought[i].price = e.detail.value - // 处理数据回显时, 调整数量, 选中的数据不改变的问题 - let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id); - obj ? obj.price = e.detail.value:null; + // 处理数据回显时, 调整数量, 选中的数据不改变的问题 + let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id); + obj ? obj.price = e.detail.value : null; // this.$set(item, 'check', false); // for (let i in this.checkedArr) { // if (this.checkedArr[i].product_id == item.product_id) { @@ -216,9 +216,9 @@ numberChange(data, i) { this.peicenumber = data.number; this.bought[i].number = data.number; - // 处理数据回显时, 调整数量, 选中的数据不改变的问题 - let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id); - obj ? obj.number = data.number:null; + // 处理数据回显时, 调整数量, 选中的数据不改变的问题 + let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id); + obj ? obj.number = data.number : null; }, tabs(index) { @@ -289,7 +289,7 @@ that.$set(item, 'check', true); that.$set(item, 'number', val.number); that.$set(item, 'price', val.price); - that.peicenumber=val.number + that.peicenumber = val.number } }) }) @@ -344,7 +344,7 @@ }, /*确定提交*/ submit() { - console.log(this.checkedArr); + console.log(this.checkedArr); this.$emit('getProduct', this.checkedArr); }, @@ -396,14 +396,14 @@ width: 44rpx; height: 44rpx; line-height: 44rpx; - + border-radius: 50%; text-align: center; - + position: absolute; top: -150rpx; right: 30rpx; - + image { width: 100%; height: 100%; @@ -483,7 +483,6 @@ line-height: 60rpx; text-align: center; font-size: 28rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #959595; background-color: #E7E6E4; @@ -512,9 +511,7 @@ background: #F5F5F5; border-radius: 7rpx 7rpx 7rpx 7rpx; font-size: 28rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; - margin-left: 20rpx; diff --git a/components/release/release.vue b/components/release/release.vue index bacdf9e..3bbce82 100644 --- a/components/release/release.vue +++ b/components/release/release.vue @@ -63,13 +63,13 @@ }, methods: { navigtion(item) { - - if (item.title1 =='发布调货商品') { + + if (item.title1 == '发布调货商品') { uni.navigateTo({ url: '/pages/trading_hall/transfer_goods/index' }) } else { - + uni.navigateTo({ url: '/pages/trading_hall/adddiscounts/index' }) @@ -121,7 +121,7 @@ .release_content_left { display: flex; - + } .release_content_right { @@ -135,7 +135,7 @@ height: 96rpx; margin-top: 21rpx; margin-right: 19rpx; - + image { width: 111rpx; @@ -144,10 +144,10 @@ } .release_imga { - + width: 76rpx; height: 113rpx; - + margin-top: 5rpx; margin-right: 50rpx; @@ -163,14 +163,12 @@ .title1 { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #333333; } .title2 { font-size: 28rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #666666; margin-top: 11rpx; diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue index 3fe50a5..86ec5fc 100644 --- a/components/shoppinglist/shoppinglist.vue +++ b/components/shoppinglist/shoppinglist.vue @@ -159,23 +159,23 @@ checkedObj: { handler(n) { - this.checkedArr = JSON.parse(JSON.stringify(n||{})) + this.checkedArr = JSON.parse(JSON.stringify(n || {})) }, deep: true } }, mounted() { - this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj||{})) - this.aryys = JSON.parse(JSON.stringify(this.checkedObj||{})) + this.checkedArr = JSON.parse(JSON.stringify(this.checkedObj || {})) + this.aryys = JSON.parse(JSON.stringify(this.checkedObj || {})) this.getBounht(); }, methods: { //价格 producrprice(e, i, item) { this.bought[i].price = e.detail.value - // 处理数据回显时, 调整数量, 选中的数据不改变的问题 - let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id); - obj ? obj.price = e.detail.value:null; + // 处理数据回显时, 调整数量, 选中的数据不改变的问题 + let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id); + obj ? obj.price = e.detail.value : null; // this.$set(item, 'check', false); // for (let i in this.checkedArr) { // if (this.checkedArr[i].product_id == item.product_id) { @@ -212,9 +212,9 @@ numberChange(data, i) { this.peicenumber = data.number; this.bought[i].number = data.number - // 处理数据回显时, 调整数量, 选中的数据不改变的问题 - let obj = this.checkedArr.find((item)=>item.product_id==this.bought[i].product_id); - obj ? obj.number = data.number:null; + // 处理数据回显时, 调整数量, 选中的数据不改变的问题 + let obj = this.checkedArr.find((item) => item.product_id == this.bought[i].product_id); + obj ? obj.number = data.number : null; }, tabs(index) { @@ -285,7 +285,7 @@ that.$set(item, 'check', true); that.$set(item, 'number', val.number); that.$set(item, 'price', val.price); - that.peicenumber=val.number + that.peicenumber = val.number } }) }) @@ -302,7 +302,7 @@ goodsCheck(item) { this.$set(item, 'check', !item.check); if (item.check) { - + if (this.peicenumber == 0) { item.number = 1 } @@ -314,7 +314,7 @@ this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1) } }, - + /*确定提交*/ submit() { @@ -456,7 +456,6 @@ line-height: 60rpx; text-align: center; font-size: 28rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #959595; background-color: #E7E6E4; @@ -485,7 +484,6 @@ background: #F5F5F5; border-radius: 7rpx 7rpx 7rpx 7rpx; font-size: 28rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; margin-left: 20rpx; diff --git a/components/shortPopup.vue b/components/shortPopup.vue index 5402c35..99c85fd 100644 --- a/components/shortPopup.vue +++ b/components/shortPopup.vue @@ -1,552 +1,554 @@ \ No newline at end of file diff --git a/manifest.json b/manifest.json index 31627ab..162b6a4 100644 --- a/manifest.json +++ b/manifest.json @@ -163,6 +163,134 @@ "splashscreen" : { "useOriginalMsgbox" : true } + }, + "nativePlugins" : { + "JG-JCore" : { + "JPUSH_APPKEY_IOS" : "", + "JPUSH_CHANNEL_IOS" : "", + "JPUSH_APPKEY_ANDROID" : "", + "JPUSH_CHANNEL_ANDROID" : "", + "__plugin_info__" : { + "name" : "JG-JCore", + "description" : "极光推送JCore插件", + "platforms" : "Android,iOS", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : { + "JPUSH_APPKEY_IOS" : { + "des" : "[iOS]极光portal配置应用信息时分配的AppKey", + "key" : "JCore:APP_KEY", + "value" : "" + }, + "JPUSH_CHANNEL_IOS" : { + "des" : "[iOS]用于统计分发渠道，不需要可填默认值developer-default", + "key" : "JCore:CHANNEL", + "value" : "" + }, + "JPUSH_APPKEY_ANDROID" : { + "des" : "[Android]极光portal配置应用信息时分配的AppKey", + "key" : "JPUSH_APPKEY", + "value" : "" + }, + "JPUSH_CHANNEL_ANDROID" : { + "des" : "[Android]用于统计分发渠道，不需要可填默认值developer-default", + "key" : "JPUSH_CHANNEL", + "value" : "" + } + } + } + }, + "JG-JPush" : { + "JPUSH_ISPRODUCTION_IOS" : "", + "JPUSH_ADVERTISINGID_IOS" : "", + "JPUSH_DEFAULTINITJPUSH_IOS" : "", + "JPUSH_OPPO_APPKEY" : "", + "JPUSH_OPPO_APPID" : "", + "JPUSH_OPPO_APPSECRET" : "", + "JPUSH_VIVO_APPKEY" : "", + "JPUSH_VIVO_APPID" : "", + "JPUSH_MEIZU_APPKEY" : "", + "JPUSH_MEIZU_APPID" : "", + "JPUSH_XIAOMI_APPKEY" : "", + "JPUSH_XIAOMI_APPID" : "", + "__plugin_info__" : { + "name" : "JG-JPush", + "description" : "极光推送Hbuilder插件", + "platforms" : "Android,iOS", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : { + "JPUSH_ISPRODUCTION_IOS" : { + "des" : "[iOS]是否是生产环境，是填true，不是填false或者不填", + "key" : "JPush:ISPRODUCTION", + "value" : "" + }, + "JPUSH_ADVERTISINGID_IOS" : { + "des" : "[iOS]广告标识符（IDFA）如果不需要使用IDFA，可不填", + "key" : "JPush:ADVERTISINGID", + "value" : "" + }, + "JPUSH_DEFAULTINITJPUSH_IOS" : { + "des" : "[iOS]是否默认初始化，是填true，不是填false或者不填", + "key" : "JPush:DEFAULTINITJPUSH", + "value" : "" + }, + "JPUSH_OPPO_APPKEY" : { + "des" : "厂商OPPO-appkey,示例：OP-12345678", + "key" : "OPPO_APPKEY", + "value" : "" + }, + "JPUSH_OPPO_APPID" : { + "des" : "厂商OPPO-appId,示例：OP-12345678", + "key" : "OPPO_APPID", + "value" : "" + }, + "JPUSH_OPPO_APPSECRET" : { + "des" : "厂商OPPO-appSecret,示例：OP-12345678", + "key" : "OPPO_APPSECRET", + "value" : "" + }, + "JPUSH_VIVO_APPKEY" : { + "des" : "厂商VIVO-appkey,示例：12345678", + "key" : "com.vivo.push.api_key", + "value" : "" + }, + "JPUSH_VIVO_APPID" : { + "des" : "厂商VIVO-appId,示例：12345678", + "key" : "com.vivo.push.app_id", + "value" : "" + }, + "JPUSH_MEIZU_APPKEY" : { + "des" : "厂商MEIZU-appKey,示例：MZ-12345678", + "key" : "MEIZU_APPKEY", + "value" : "" + }, + "JPUSH_MEIZU_APPID" : { + "des" : "厂商MEIZU-appId,示例：MZ-12345678", + "key" : "MEIZU_APPID", + "value" : "" + }, + "JPUSH_XIAOMI_APPKEY" : { + "des" : "厂商XIAOMI-appKey,示例：MI-12345678", + "key" : "XIAOMI_APPKEY", + "value" : "" + }, + "JPUSH_XIAOMI_APPID" : { + "des" : "厂商XIAOMI-appId,示例：MI-12345678", + "key" : "XIAOMI_APPID", + "value" : "" + } + } + } + } } }, /* 快应用特有相关 */ diff --git a/pages.json b/pages.json index dc1be56..8347c95 100644 --- a/pages.json +++ b/pages.json @@ -47,7 +47,38 @@ "enablePullDownRefresh": true, // #endif "app-plus": { - "scrollIndicator": false //禁用原生导航栏 + "scrollIndicator": false, //禁用原生导航栏 + "subNVues": [{ + "id": "concat", // 唯一标识 + "path": "pages/index/subnvue/concat", // 页面路径 + "type": "popup", + "style": { + "position": "absolute", + "dock": "right", + "width": "750rpx", + "height": "1500rpx", + "background": "rgba(0,0,0,0.2)" + } + }] + } + } + }, + { + "path": "pages/test/index", //首页 + "style": { + "app-plus": { + "subNVues": [{ + "id": "concat", // 唯一标识 + "path": "pages/test/subnvue/concat", // 页面路径 + /*"type": "popup", 这里不需要*/ + "style": { + "position": "absolute", + "dock": "right", + "width": "100rpx", + "height": "150rpx", + "background": "transparent" + } + }] } } }, @@ -308,12 +339,11 @@ } }, { - "path" : "pages/cashier/cashier", - "style" : - { - "navigationBarTitleText" : "收银", - "enablePullDownRefresh" : true - } + "path": "pages/cashier/cashier", + "style": { + "navigationBarTitleText": "收银", + "enablePullDownRefresh": true + } } ], "subPackages": [{ @@ -1367,7 +1397,15 @@ "navigationBarTitleText": "商品详情" } - }, { + }, + { + "path": "goods_details/videoPlay", + "style": { + "navigationBarTitleText": "视屏详情" + + } + }, + { "path": "stockOut/index", "style": { "navigationBarTitleText": "扫码出库", @@ -1390,7 +1428,22 @@ "path": "list/index", "style": { "navigationBarTitleText": "商品管理", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "app-plus": { + "scrollIndicator": false, //禁用原生导航栏 + "subNVues": [{ + "id": "concatpro", // 唯一标识 + "path": "list/subnvue/concat", // 页面路径 + "type": "popup", + "style": { + "position": "absolute", + "dock": "right", + "width": "750rpx", + "height": "2000rpx", + "background": "rgba(0,0,0,0.2)" + } + }] + } } }, { @@ -1505,7 +1558,14 @@ }, { "path": "addGood/addGood", "style": { - "navigationBarTitleText": "商品设置", + "navigationBarTitleText": "发布商品", + "enablePullDownRefresh": false + } + }, + { + "path": "addGood/addGoodOld", + "style": { + "navigationBarTitleText": "发布商品", "enablePullDownRefresh": false } }, @@ -1536,7 +1596,43 @@ "navigationBarTitleText": "更新库存", "enablePullDownRefresh": false } + }, + { + "path": "addGoodDetail/addGoodDetail", + "style": { + "navigationBarTitleText": "发布商品", + "enablePullDownRefresh": false + } + }, + { + "path": "addGoodDetail/goodsType", + "style": { + "navigationBarTitleText": "商品分类", + "enablePullDownRefresh": false + } + }, + { + "path": "addGoodDetail/goodsAttr", + "style": { + "navigationBarTitleText": "商品属性", + "enablePullDownRefresh": false + } + }, + { + "path": "addGoodDetail/goodsPrice", + "style": { + "navigationBarTitleText": "价格与规格", + "enablePullDownRefresh": false + } + }, + { + "path": "addGoodDetail/goodsSearch", + "style": { + "navigationBarTitleText": "商品分类", + "enablePullDownRefresh": false + } } + ] }, { diff --git a/pages/admin/financial_management/index.vue b/pages/admin/financial_management/index.vue index 7fb54bb..d15f5c4 100644 --- a/pages/admin/financial_management/index.vue +++ b/pages/admin/financial_management/index.vue @@ -1,84 +1,62 @@ \ No newline at end of file diff --git a/pages/admin/goods_details/index.vue b/pages/admin/goods_details/index.vue index bd2454e..fee9768 100644 --- a/pages/admin/goods_details/index.vue +++ b/pages/admin/goods_details/index.vue @@ -1,1652 +1,1837 @@ \ No newline at end of file diff --git a/pages/admin/goods_details/videoPlay.nvue b/pages/admin/goods_details/videoPlay.nvue new file mode 100644 index 0000000..57c7b68 --- /dev/null +++ b/pages/admin/goods_details/videoPlay.nvue @@ -0,0 +1,45 @@ + + + + + \ No newline at end of file diff --git a/pages/admin/refundDetail/index.vue b/pages/admin/refundDetail/index.vue index f89abd1..05fe96f 100644 --- a/pages/admin/refundDetail/index.vue +++ b/pages/admin/refundDetail/index.vue @@ -5,7 +5,7 @@ 审核未通过 待退货 待收货 - 已退款 + 已退款 {{ orderInfo.user && orderInfo.user.nickname }} @@ -16,7 +16,8 @@ {{ orderInfo.mer_delivery_address }} - + @@ -26,7 +27,9 @@ - + @@ -71,7 +74,7 @@ 退款原因： - {{ orderInfo.refund_message }} + {{ getRightText(orderInfo.refund_message) }} 备注信息： @@ -90,26 +93,25 @@ 订单备注 - 查看物流 + 查看物流 + 确认收货 - - - 订单备注 - - - - - - - 确认提交 - - - + + + 订单备注 + + + + + + + 确认提交 + + + @@ -132,12 +134,15 @@ refundOrderReceive, setRefundMark } from "@/api/admin"; - import { isMoney } from '@/utils/validate.js' - import { HTTP_REQUEST_URL } from '@/config/app'; + import { + isMoney + } from '@/utils/validate.js' + import { + HTTP_REQUEST_URL + } from '@/config/app'; export default { name: "AdminOrder", - components: { - }, + components: {}, props: {}, data: function() { return { @@ -155,7 +160,7 @@ payType: "", types: "", clickNum: 1, - goname:'', + goname: '', domain: HTTP_REQUEST_URL, }; }, @@ -179,19 +184,27 @@ var clipboard = new ClipboardJS('.copy-data'); clipboard.on('success', function(e) { self.$util.Tips({ - title:'复制成功' + title: '复制成功' }) }); clipboard.on('error', function(e) { self.$util.Tips({ - title:'复制失败' + title: '复制失败' }) }); }); // #endif - + }, methods: { + getRightText(str) { + const index = str.indexOf("@"); + if (index !== -1) { + return str.substring(index + 1); + } else { + return str + } + }, more: function() { this.order = !this.order; }, @@ -203,7 +216,7 @@ this.change = false; }, // 查看大图 - loookImg(item,index){ + loookImg(item, index) { uni.previewImage({ urls: this.orderInfo.pics, current: this.orderInfo.pics[index] @@ -216,38 +229,37 @@ urls: list }); }, - copyText: function (e) { - // var copy = e.currentTarget.dataset.copy; //data-copy传过来的数值 - let arr = [ - { - name: "收货人姓名", - value: this.orderInfo.real_name - }, - { - name: "收货人电话", - value: this.orderInfo.user_phone - }, - { - name: "收货人地址", - value: this.orderInfo.user_address - } - ] - wx.setClipboardData({ - data: `${arr.map(item =>`${item.name}: ${item.value}`).join("\n")}`, - success: function (res) { - wx.getClipboardData({ - success: function (res) { - wx.showToast({ - title: '复制成功' - }) - } - }) - } - }) + copyText: function(e) { + // var copy = e.currentTarget.dataset.copy; //data-copy传过来的数值 + let arr = [{ + name: "收货人姓名", + value: this.orderInfo.real_name + }, + { + name: "收货人电话", + value: this.orderInfo.user_phone + }, + { + name: "收货人地址", + value: this.orderInfo.user_address + } + ] + wx.setClipboardData({ + data: `${arr.map(item =>`${item.name}: ${item.value}`).join("\n")}`, + success: function(res) { + wx.getClipboardData({ + success: function(res) { + wx.showToast({ + title: '复制成功' + }) + } + }) + } + }) }, getIndex: function() { let that = this; - getRefundOrderDetail(that.mer_id,that.order_id).then( + getRefundOrderDetail(that.mer_id, that.order_id).then( res => { that.orderInfo = res.data; }, @@ -269,7 +281,7 @@ content: '为保障权益，请收到货确认无误后，再确认收货', success: function(res) { if (res.confirm) { - refundOrderReceive(that.mer_id,that.orderInfo.refund_order_id).then(res => { + refundOrderReceive(that.mer_id, that.orderInfo.refund_order_id).then(res => { return that.$util.Tips({ title: '操作成功', icon: 'success' @@ -286,14 +298,16 @@ }) }, // 提交备注信息 - save(){ + save() { let that = this; if (!that.orderInfo.mer_mark) { return this.$util.Tips({ title: '请输入备注' }) } - setRefundMark(that.mer_id,that.orderInfo.refund_order_id,{ mer_mark: that.orderInfo.mer_mark }).then( + setRefundMark(that.mer_id, that.orderInfo.refund_order_id, { + mer_mark: that.orderInfo.mer_mark + }).then( res => { that.change = false; this.$util.Tips({ @@ -318,7 +332,7 @@ } }); }, - copyData(id){ + copyData(id) { uni.setClipboardData({ data: id, success: function() { @@ -348,36 +362,44 @@ background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%); background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%); } + .pos-order-details .header .state { font-size: 36upx; color: #fff; } + .pos-order-details .header .data { margin-left: 35upx; font-size: 28upx; } + .pos-order-details .header .data .order-num { font-size: 30upx; margin-bottom: 8upx; } + .pos-order-details .remarks { width: 100%; height: 86upx; background-color: #fff; padding: 0 30upx; } + .pos-order-details .remarks .iconfont { font-size: 40upx; color: #2a7efb; } + .pos-order-details .remarks input { width: 630upx; height: 100%; font-size: 30upx; } + .pos-order-details .remarks input::placeholder { color: #666; } + .pos-order-details .orderingUser { font-size: 26upx; color: #282828; @@ -387,17 +409,21 @@ margin-top: 16upx; border-bottom: 1px solid #f5f5f5; } + .pos-order-details .orderingUser .iconfont { font-size: 40upx; color: #2a7efb; margin-right: 15upx; } + .pos-order-details .address { margin-top: 0; } + .pos-order-details .pos-order-goods { margin-top: 17upx; } + .pos-order-details .footer .more { font-size: 27upx; color: #aaa; @@ -408,11 +434,13 @@ margin-right: 25upx; position: relative; } + .pos-order-details .footer .delivery { background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%); background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%); background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%); } + .pos-order-details .footer .more .order .arrow { width: 0; height: 0; @@ -423,6 +451,7 @@ left: 15upx; bottom: -18upx; } + .pos-order-details .footer .more .order .arrow:before { content: ''; width: 0; @@ -434,6 +463,7 @@ left: -10upx; bottom: 0; } + .pos-order-details .footer .more .order { width: 200upx; background-color: #fff; @@ -443,68 +473,84 @@ top: -200upx; z-index: 9; } + .pos-order-details .footer .more .order .item { height: 77upx; line-height: 77upx; } + .pos-order-details .footer .more .order .item~.item { border-top: 1px solid #f5f5f5; } + .pos-order-details .footer .more .moreName { width: 100%; height: 100%; } + .order-details .header { padding: 0 30upx; height: 150upx; } + .order-details .header.on { background-color: #666 !important; } + .order-details .header .pictrue { width: 110upx; height: 110upx; } + .order-details .header .pictrue image { width: 100%; height: 100%; } + .order-details .header .data { color: rgba(255, 255, 255, 0.8); font-size: 24upx; margin-left: 27upx; } + .order-details .header.on .data { margin-left: 0; } + .order-details .header .data .state { font-size: 30upx; font-weight: bold; color: #fff; margin-bottom: 7upx; } + .order-details .nav { background-color: #fff; font-size: 26upx; color: #282828; padding: 25upx 0; } + .order-details .nav .navCon { padding: 0 40upx; } + .order-details .nav .navCon .on { font-weight: bold; color: #e93323; } + .order-details .nav .progress { padding: 0 65upx; margin-top: 10upx; } + .order-details .nav .progress .line { width: 100upx; height: 2upx; background-color: #939390; } + .order-details .nav .progress .iconfont { font-size: 25upx; color: #939390; @@ -515,6 +561,7 @@ text-align: center; margin-right: 0 !important; } + .order-details .address { font-size: 26upx; color: #868686; @@ -522,52 +569,64 @@ padding: 25upx 30upx 30upx 30upx; position: relative; } + .order-details .address .name { font-size: 30upx; color: #282828; margin-bottom: 0.1rem; } + .order-details .address .name .phone { margin-left: 40upx; } + .order-details .line { width: 100%; height: 3upx; } + .order-details .line image { width: 100%; height: 100%; display: block; } + .order-details .wrapper { background-color: #fff; margin-top: 12upx; padding: 30upx; } + .order-details .wrapper .item { font-size: 28upx; color: #282828; } + .order-details .wrapper .item~.item { margin-top: 20upx; } + .order-details .wrapper .item .conter { color: #868686; text-align: right; } + .order-details .wrapper .item .virtual_image { // text-align: left; margin-left: 50rpx; } - .order-details .wrapper .item .virtual_image .picture{ + + .order-details .wrapper .item .virtual_image .picture { width: 106rpx; height: 106rpx; border-radius: 8rpx; margin-right: 10rpx; - &:last-child{ + + &:last-child { margin-right: 0; } } + .order-details .wrapper .item .conter .copy { font-size: 20rpx; color: #868686; @@ -581,7 +640,8 @@ justify-content: center; border-radius: 16rpx; } - .address .copy{ + + .address .copy { font-size: 20rpx; color: #868686; border-radius: 3rpx; @@ -594,17 +654,20 @@ border-radius: 16rpx; position: absolute; right: 30rpx; - top: 20rpx; + top: 20rpx; } + .order-details .wrapper .actualPay { border-top: 1upx solid #eee; margin-top: 30upx; padding-top: 30upx; } + .order-details .wrapper .actualPay .money { font-weight: bold; font-size: 30upx; } + .order-details .footer { width: 100%; height: 100upx; @@ -615,6 +678,7 @@ padding: 0 30upx; border-top: 1px solid #eee; } + .order-details .footer .bnt { width: auto; height: 60upx; @@ -626,52 +690,65 @@ font-size: 27upx; padding: 0 3%; } + .order-details .footer .bnt.cancel { color: #aaa; border: 1px solid #ddd; } + .order-details .footer .bnt.default { color: #444; border: 1px solid #444; } + .order-details .footer .bnt~.bnt { margin-left: 18upx; } + .pos-order-goods { padding: 0 30upx; background-color: #fff; } + .pos-order-goods .goods { height: 185upx; position: relative; } + .pos-order-goods .goods~.goods { border-top: 1px dashed #e5e5e5; } + .pos-order-goods .goods .picTxt { width: 515upx; } + .pos-order-goods .goods .picTxt .pictrue { width: 130upx; height: 130upx; } + .pos-order-goods .goods .picTxt .pictrue image { width: 100%; height: 100%; border-radius: 6upx; } + .pos-order-goods .goods .picTxt .text { width: 365upx; height: 130upx; } + .pos-order-goods .goods .picTxt .text .info { font-size: 28upx; color: #282828; } + .pos-order-goods .goods .picTxt .text .attr { font-size: 24upx; color: #999; } + .pos-order-goods .goods .money { width: 164upx; text-align: right; @@ -681,48 +758,117 @@ right: 0; color: #999999; } - .pos-order-goods .goods .money .refund_num{ + + .pos-order-goods .goods .money .refund_num { display: inline-block; margin-left: 10rpx; } + .pos-order-goods .goods .x-money { color: #FF9600; } -.priceChange{position:fixed;width:580upx;background-color:#fff;border-radius:10upx;top:50%;left:50%;margin-left:-290upx;margin-top:-335upx;z-index:666;transition:all 0.3s ease-in-out 0s;transform: scale(0);opacity:0;} -.priceChange.on{opacity:1;transform: scale(1);} -.priceChange .priceTitle{background:url("~@/static/images/pricetitle.jpg") no-repeat;background-size:100% 100%;width:100%;height:160upx;border-radius:10upx 10upx 0 0;text-align:center;font-size:40upx;color:#fff;line-height:160upx;position:relative;} -.priceChange .priceTitle .iconfont{position:absolute;font-size:40upx;right:26upx;top:23upx;width:40upx;height:40upx;line-height:40upx;} -.priceChange .listChange{padding:0 40upx;} -.priceChange .listChange textarea{box-sizing: border-box;} -.priceChange .listChange .item{height:103upx;border-bottom:1px solid #e3e3e3;font-size:32upx;color:#333;} -.priceChange .modify{font-size:32upx;color:#fff;width:490upx;height:90upx;text-align:center;line-height:90upx;border-radius:45upx;background-color:#2291f8;margin:53upx auto;} -.priceChange .listChange textarea { - border: 1px solid #eee; - width: 100%; - height: 200upx; - margin-top: 50upx; - border-radius: 10upx; - color: #333; - padding: 20upx; -} -.upload-img{ - display: flex; - flex-wrap: wrap; - margin-top: 20rpx; - .img-item{ + + .priceChange { + position: fixed; + width: 580upx; + background-color: #fff; + border-radius: 10upx; + top: 50%; + left: 50%; + margin-left: -290upx; + margin-top: -335upx; + z-index: 666; + transition: all 0.3s ease-in-out 0s; + transform: scale(0); + opacity: 0; + } + + .priceChange.on { + opacity: 1; + transform: scale(1); + } + + .priceChange .priceTitle { + background: url("~@/static/images/pricetitle.jpg") no-repeat; + background-size: 100% 100%; + width: 100%; + height: 160upx; + border-radius: 10upx 10upx 0 0; + text-align: center; + font-size: 40upx; + color: #fff; + line-height: 160upx; position: relative; - width: 156rpx; - height: 156rpx; - margin-right: 23rpx; + } + + .priceChange .priceTitle .iconfont { + position: absolute; + font-size: 40upx; + right: 26upx; + top: 23upx; + width: 40upx; + height: 40upx; + line-height: 40upx; + } + + .priceChange .listChange { + padding: 0 40upx; + } + + .priceChange .listChange textarea { + box-sizing: border-box; + } + + .priceChange .listChange .item { + height: 103upx; + border-bottom: 1px solid #e3e3e3; + font-size: 32upx; + color: #333; + } + + .priceChange .modify { + font-size: 32upx; + color: #fff; + width: 490upx; + height: 90upx; + text-align: center; + line-height: 90upx; + border-radius: 45upx; + background-color: #2291f8; + margin: 53upx auto; + } + + .priceChange .listChange textarea { + border: 1px solid #eee; + width: 100%; + height: 200upx; + margin-top: 50upx; + border-radius: 10upx; + color: #333; + padding: 20upx; + } + + .upload-img { + display: flex; + flex-wrap: wrap; margin-top: 20rpx; - &:nth-child(4n){ - margin-right: 0; - } - image{ + + .img-item { + position: relative; width: 156rpx; height: 156rpx; - border-radius: 8rpx; + margin-right: 23rpx; + margin-top: 20rpx; + + &:nth-child(4n) { + margin-right: 0; + } + + image { + width: 156rpx; + height: 156rpx; + border-radius: 8rpx; + } } } -} - + \ No newline at end of file diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue index 29694e5..e4374db 100644 --- a/pages/chat/customer_list/index.vue +++ b/pages/chat/customer_list/index.vue @@ -106,6 +106,7 @@ this.isAuto = true; this.isShowAuth = true } + this.getindex() }, onHide() { if (this.timer) { @@ -145,6 +146,8 @@ this.isAuto = true; this.isShowAuth = true } + // this.getList(this.mer_id) + // this.getList(res.data.service.mer_id, true); }); }, onLoadFun() { diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue index f1fd411..50d088b 100644 --- a/pages/commissionedSales/addDelegation/index.vue +++ b/pages/commissionedSales/addDelegation/index.vue @@ -9,8 +9,8 @@ 被委托商家 - + @@ -170,16 +170,16 @@ }, //获取商品信息 getProduct(data) { - this.productList = []; - this.formData.product_info = []; - this.formData.content = ''; - if (data.length > 0) { - this.productList = data; + this.productList = []; + this.formData.product_info = []; + this.formData.content = ''; + if (data.length > 0) { + this.productList = data; for (let i in data) { this.formData.content += data[i].store_name + ','; - if(typeof this.productList[i].image == 'object'){ - this.productList[i].image = this.productList[i].image[0] - } + if (typeof this.productList[i].image == 'object') { + this.productList[i].image = this.productList[i].image[0] + } this.formData.product_info.push({ product_attr_unique: data[i].product_attr_unique, number: Number(data[i].number), @@ -187,7 +187,7 @@ }) } } - this.formData.content = this.formData.content.slice(0,-1); + this.formData.content = this.formData.content.slice(0, -1); this.$refs.associated.close() }, //提交 @@ -199,79 +199,79 @@ if (value.entrust_day.length == 0 || value.entrust_day <= 0) return that.$util.Tips({ title: '请选择委托周期' }); - if (value.entrust_day < 15) return that.$util.Tips({ - title: '委托周期不得小于15天' - }); - if (value.entrust_day > 90) return that.$util.Tips({ - title: '委托周期不得大于90天' - }); + if (value.entrust_day < 15) return that.$util.Tips({ + title: '委托周期不得小于15天' + }); + if (value.entrust_day > 90) return that.$util.Tips({ + title: '委托周期不得大于90天' + }); if (value.product_info.length == 0) return that.$util.Tips({ title: '请选择产品' }); if (!value.entrust_mer_id) return that.$util.Tips({ title: '请添加商家' }); - this.type? - editentrust(this.id,value).then(res => { - if (res.status == '200') { - uni.hideLoading() - that.$util.Tips({ - title: '编辑成功', - icon: 'success' - }); - that.formData = { - entrust_mer_id: '', - entrust_day: 0, - is_type: "4", - product_info: [] - } - uni.redirectTo({ - url: '/pages/commissionedSales/initiateDelegation/index' - }) - - } else { - that.$util.Tips({ - title: res.messge, - icon: 'success' - }); - } - }).catch(err => { - - return that.$util.Tips({ - title: err - }); - }) - - : - entrustchain(value).then(res => { - if (res.status == '200') { - uni.hideLoading() - that.$util.Tips({ - title: '提交成功', - icon: 'success' - }); - that.formData = { - entrust_mer_id: '', - entrust_day: 0, - is_type: "4", - product_info: [] - } - uni.redirectTo({ - url: '/pages/commissionedSales/initiateDelegation/index' - }) + this.type ? + editentrust(this.id, value).then(res => { + if (res.status == '200') { + uni.hideLoading() + that.$util.Tips({ + title: '编辑成功', + icon: 'success' + }); + that.formData = { + entrust_mer_id: '', + entrust_day: 0, + is_type: "4", + product_info: [] + } + uni.redirectTo({ + url: '/pages/commissionedSales/initiateDelegation/index' + }) - } else { - that.$util.Tips({ - title: res.messge, - icon: 'success' - }); - } - }).catch(err => { + } else { + that.$util.Tips({ + title: res.messge, + icon: 'success' + }); + } + }).catch(err => { - return that.$util.Tips({ - title: err - }); - }) + return that.$util.Tips({ + title: err + }); + }) + + : + entrustchain(value).then(res => { + if (res.status == '200') { + uni.hideLoading() + that.$util.Tips({ + title: '提交成功', + icon: 'success' + }); + that.formData = { + entrust_mer_id: '', + entrust_day: 0, + is_type: "4", + product_info: [] + } + uni.redirectTo({ + url: '/pages/commissionedSales/initiateDelegation/index' + }) + + } else { + that.$util.Tips({ + title: res.messge, + icon: 'success' + }); + } + }).catch(err => { + + return that.$util.Tips({ + title: err + }); + }) } } @@ -316,7 +316,6 @@ .center-one-txt { .one-txta { font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -325,7 +324,6 @@ display: flex; margin-top: 28rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; @@ -351,7 +349,6 @@ margin-top: 32rpx; margin-bottom: 20rpx; font-size: 32rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #333333; } @@ -525,7 +522,6 @@ background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); border-radius: 42px 42px 42px 42px; font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #FFFFFF; } diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue index f4260ed..161808f 100644 --- a/pages/commissionedSales/delegation_details/index.vue +++ b/pages/commissionedSales/delegation_details/index.vue @@ -101,7 +101,8 @@ 拒绝原因: - + {{objinfo.entrust_finish_refusal}} @@ -111,7 +112,7 @@ 查看TA提到的宝贝 - ({{objinfo.product_list.length||0}}) + ({{objinfo.product_list.length||0}}) @@ -154,13 +155,13 @@ } ], type: 0, - credit_buy: 0, + credit_buy: 0, } }, onLoad(e) { this.list(e.id) this.type = e.type - this.credit_buy = e.credit_buy || 0; + this.credit_buy = e.credit_buy || 0; }, onShow() { @@ -233,7 +234,6 @@ .top-two-one { font-size: 35rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #FFFFFF; margin-top: 10rpx; @@ -280,7 +280,6 @@ .center-one-txt { .one-txta { font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -289,7 +288,6 @@ display: flex; margin-top: 28rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; @@ -316,7 +314,6 @@ .center-twoa { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #333333; } @@ -327,7 +324,6 @@ word-wrap: break-word; font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; } @@ -377,7 +373,6 @@ background: linear-gradient(84deg, #F98649 0%, #F34E45 100%); border-radius: 42px 42px 42px 42px; font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #FFFFFF; position: absolute; diff --git a/pages/commissionedSales/index/index.vue b/pages/commissionedSales/index/index.vue index 1cd1dbf..e9adacf 100644 --- a/pages/commissionedSales/index/index.vue +++ b/pages/commissionedSales/index/index.vue @@ -147,7 +147,6 @@ .titlea { font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #FFFFFF; } @@ -155,7 +154,6 @@ .titleb { margin-top: 5rpx; font-size: 25rpx; - font-family: PingFang SC; font-weight: 400; color: rgba(255, 255, 255, 0.8); } diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue index 8613885..5a7d604 100644 --- a/pages/commissionedSales/initiateDelegation/index.vue +++ b/pages/commissionedSales/initiateDelegation/index.vue @@ -11,92 +11,92 @@ - + - - {{item.title}} - - - - - 待处理 - - - - - 已接受 - - - - - 已拒绝 - - - - - 已完成 - - - - - - - - 委托周期:{{item.entrust_day}}天 - - - - - - 编辑 - - - - 删除 - - - - 详情 - - - - - - - 结束委托 - - - - 详情 - - - - - - - - 详情 - - - - - - - 删除 - - - - 详情 - - - - - + + 详情 + + + + + + + 删除 + + + + 详情 + + + + + @@ -112,7 +112,7 @@ - + @@ -418,7 +418,7 @@ // this.$refs.bindmobile2.open() this.$refs.bindmobile3.open() }, - agree(item, status=2) { + agree(item, status = 2) { finishentrust(item.community_id, { status: status, refusal: this.refuseds @@ -437,31 +437,31 @@ }, //删除订单 deleteOrder(item) { - uni.showModal({ - title:'警告', - content:'删除后不可恢复, 是否继续删除?', - complete: (e) => { - if(e.confirm){ - checkchain(item.community_id, { - status: 3 - }).then(res => { - this.$util.Tips({ - title: res.message, - icon: 'success' - }) - this.orderList = [] - this.tabTitle = "tabOne" - this.commislist() - }).catch((err) => { - console.log(err) - this.$util.Tips({ - title: err, - icon: 'error' - }) - }) - } - } - }) + uni.showModal({ + title: '警告', + content: '删除后不可恢复, 是否继续删除?', + complete: (e) => { + if (e.confirm) { + checkchain(item.community_id, { + status: 3 + }).then(res => { + this.$util.Tips({ + title: res.message, + icon: 'success' + }) + this.orderList = [] + this.tabTitle = "tabOne" + this.commislist() + }).catch((err) => { + console.log(err) + this.$util.Tips({ + title: err, + icon: 'error' + }) + }) + } + } + }) }, // 审核未通过 编辑 auditEdit() { @@ -542,7 +542,6 @@ .adddelegation-two { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #FFFFFF; margin-top: 25rpx; @@ -569,7 +568,7 @@ .content-one { - width: 100%; + width: 100%; display: flex; padding-bottom: 23rpx; @@ -579,8 +578,8 @@ height: 148rpx; margin-right: 28rpx; // border: 1px solid; - border-radius: 10rpx; - overflow: hidden; + border-radius: 10rpx; + overflow: hidden; image { width: 100%; @@ -593,7 +592,6 @@ .txt-b-a { font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -612,33 +610,35 @@ .txt-b-b { font-size: 28rpx; - font-family: PingFang SC; font-weight: 400; color: #333333 } } } - - .content-text{ - flex: 1; - display: flex; - flex-direction: column; - justify-content: space-between; - .text-bottom{ - display: flex; - justify-content: space-between; - } - .one-txt-a{ - flex: 1; - font-size: 30rpx; - display: -webkit-box; - -webkit-line-clamp: 2; /* 限制为三行 */ - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - } + + .content-text { + flex: 1; + display: flex; + flex-direction: column; + justify-content: space-between; + + .text-bottom { + display: flex; + justify-content: space-between; + } + + .one-txt-a { + flex: 1; + font-size: 30rpx; + display: -webkit-box; + -webkit-line-clamp: 2; + /* 限制为三行 */ + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + } } @@ -686,7 +686,6 @@ .contentgn_a { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #F84221; margin-right: 10rpx; @@ -704,7 +703,6 @@ .contentgn_b { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; margin-left: 10rpx; @@ -716,7 +714,7 @@ .content-two_one { - flex-shrink: 0; + flex-shrink: 0; text-align: right; @@ -760,7 +758,6 @@ .contentgn_a { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #F84221; margin-right: 10rpx; @@ -777,7 +774,6 @@ .contentgn_b { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; margin-left: 10rpx; @@ -819,7 +815,6 @@ .bg-content-a { margin-left: 242rpx; font-size: 35rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -827,14 +822,12 @@ .bg-content-b { margin-left: 35rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; margin-top: 32rpx; span { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #F84221; margin-left: 18rpx; @@ -844,14 +837,12 @@ .bg-content-c { margin-left: 35rpx; font-size: 35rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; margin-top: 32rpx; span { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #F84221; margin-left: 18rpx; @@ -867,7 +858,6 @@ height: 95rpx; line-height: 95rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; margin-left: 121rpx; @@ -880,7 +870,6 @@ line-height: 95rpx; text-align: center; font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #FFFFFF; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); @@ -904,7 +893,6 @@ .bg-content-a { margin-left: 242rpx; font-size: 35rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -917,7 +905,6 @@ height: 95rpx; line-height: 95rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; margin-left: 121rpx; @@ -930,7 +917,6 @@ line-height: 95rpx; text-align: center; font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #FFFFFF; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); @@ -957,7 +943,6 @@ .bg-content-a { margin-left: 242rpx; font-size: 35rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -965,14 +950,12 @@ .bg-content-b { margin-left: 35rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; margin-top: 32rpx; span { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #F84221; margin-left: 18rpx; @@ -982,14 +965,12 @@ .bg-content-c { margin-left: 35rpx; font-size: 35rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; margin-top: 22rpx; span { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #F84221; margin-left: 18rpx; @@ -1017,7 +998,6 @@ line-height: 95rpx; text-align: center; font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #FFFFFF; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue index 5d9976b..ceff427 100644 --- a/pages/commissionedSales/receivedCommission/index.vue +++ b/pages/commissionedSales/receivedCommission/index.vue @@ -13,94 +13,98 @@ - - {{item.title}} - - - - - 待处理 - - - - - 已接受 - - - - - 已拒绝 - - - - - 已完成 - - - - - - - - 委托周期:{{item.entrust_day}}天 - - - - - - 处理 - - - - 详情 - - - - - - - - 申请结束 - - - 已结束 - - - 被拒绝 - - - 申请中 - - - - - 去下单 - - - - - 详情 - - - - - - - 详情 - - - - - - - - 详情 - - - - - + + {{item.title}} + + + + + 待处理 + + + + + 已接受 + + + + + 已拒绝 + + + + + 已完成 + + + + + + + + 委托周期:{{item.entrust_day}}天 + + + + + + 处理 + + + + 详情 + + + + + + + + 申请结束 + + + 已结束 + + + 被拒绝 + + + 申请中 + + + + + 去下单 + + + + + 详情 + + + + + + + 详情 + + + + + + + + 详情 + + + + + @@ -120,23 +124,23 @@ 委托申请处理 - - 委托方: {{obj.mer_info.mer_name}} - + + 委托方: {{obj.mer_info.mer_name}} + - - 结算周期: {{obj.mer_info.settle_cycle}}天 - - - 利息比例: {{obj.mer_info.interest_rate}}% - - - - - 该商户暂不支持先货后款 - - - + + 结算周期: {{obj.mer_info.settle_cycle}}天 + + + 利息比例: {{obj.mer_info.interest_rate}}% + + + + + 该商户暂不支持先货后款 + + + 拒绝 @@ -249,7 +253,7 @@ entrustlist, finishchain, checkchain, - addEntrustCart + addEntrustCart } from '@/api/sale.js' export default { components: { @@ -264,7 +268,7 @@ activeItem: "tabOne", tabTitle: "", orderList: [], - type_id: '', + type_id: '', where: { page: 1, type: 2, @@ -316,7 +320,7 @@ } }, onLoad(options) { - this.type_id = options.type_id + this.type_id = options.type_id this.tabTitle = this.tabs[0].name //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: console.log(this.tabs[0]) @@ -390,20 +394,20 @@ // uni.navigateTo({ // url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1' // }) - addEntrustCart({ - community_id: item.community_id - }).then(res => { - if (res.status == 200) { - this.$util.Tips({ - title: res.message, - icon: 'success' - }) - uni.navigateTo({ - url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id.toString()}&type_id=${this.type_id}` - }) - } - - }) + addEntrustCart({ + community_id: item.community_id + }).then(res => { + if (res.status == 200) { + this.$util.Tips({ + title: res.message, + icon: 'success' + }) + uni.navigateTo({ + url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id.toString()}&type_id=${this.type_id}` + }) + } + + }) }, //申请结束委托申请 deteragrss(item) { @@ -421,7 +425,7 @@ this.commislist() this.$refs.bindmobile1.close() }).catch((err) => { - this.$refs.bindmobile1.close() + this.$refs.bindmobile1.close() this.$util.Tips({ title: err, icon: 'error' @@ -507,7 +511,7 @@ .content-one { - width: 100%; + width: 100%; display: flex; padding-bottom: 23rpx; @@ -516,9 +520,9 @@ height: 148rpx; margin-right: 28rpx; // border: 1px solid; - border-radius: 10rpx; - overflow: hidden; - flex-shrink: 0; + border-radius: 10rpx; + overflow: hidden; + flex-shrink: 0; image { width: 100%; @@ -527,11 +531,10 @@ } .content-one-txt { - flex: 1; + flex: 1; .txt-b-a { font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -550,39 +553,41 @@ .txt-b-b { font-size: 28rpx; - font-family: PingFang SC; font-weight: 400; color: #333333 } } } - - .content-text{ - flex: 1; - display: flex; - flex-direction: column; - justify-content: space-between; - .text-bottom{ - display: flex; - justify-content: space-between; - } - .one-txt-a{ - flex: 1; - font-size: 30rpx; - display: -webkit-box; - -webkit-line-clamp: 2; /* 限制为三行 */ - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - } + + .content-text { + flex: 1; + display: flex; + flex-direction: column; + justify-content: space-between; + + .text-bottom { + display: flex; + justify-content: space-between; + } + + .one-txt-a { + flex: 1; + font-size: 30rpx; + display: -webkit-box; + -webkit-line-clamp: 2; + /* 限制为三行 */ + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + } } .content-two_oneq { text-align: right; - flex-shrink: 0; + flex-shrink: 0; .content-two-edita { @@ -624,7 +629,6 @@ .contentgn_a { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #F84221; margin-right: 10rpx; @@ -642,7 +646,6 @@ .contentgn_b { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; margin-left: 10rpx; @@ -654,7 +657,7 @@ .content-two_one { - flex-shrink: 0; + flex-shrink: 0; text-align: right; @@ -698,7 +701,6 @@ .contentgn_a { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #F84221; margin-right: 10rpx; @@ -716,7 +718,6 @@ .contentgn_b { font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; margin-left: 10rpx; @@ -757,7 +758,6 @@ .bg-content-a { margin-left: 242rpx; font-size: 35rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; } @@ -765,14 +765,12 @@ .bg-content-b { margin-left: 35rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; margin-top: 16rpx; span { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #F84221; margin-left: 18rpx; @@ -782,35 +780,32 @@ .bg-content-c { margin-left: 35rpx; font-size: 35rpx; - font-family: PingFang SC; font-weight: 500; color: #333333; margin-top: 16rpx; span { font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #F84221; margin-left: 18rpx; } } - .bg-content-d { - margin-left: 35rpx; - font-size: 32rpx; - font-family: PingFang SC; - font-weight: 500; - color: #333333; - margin-top: 16rpx; - - span { - font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; - font-weight: 500; - color: #F84221; - margin-left: 18rpx; - } - } + + .bg-content-d { + margin-left: 35rpx; + font-size: 32rpx; + font-weight: 500; + color: #333333; + margin-top: 16rpx; + + span { + font-size: 32rpx; + font-weight: 500; + color: #F84221; + margin-left: 18rpx; + } + } } .entrust_bga_btn { @@ -821,7 +816,6 @@ height: 95rpx; line-height: 95rpx; font-size: 32rpx; - font-family: PingFang SC; font-weight: 400; color: #999999; margin-left: 121rpx; @@ -834,7 +828,6 @@ line-height: 95rpx; text-align: center; font-size: 32rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #FFFFFF; background: linear-gradient(180deg, #F98649 0%, #F34E45 100%); diff --git a/pages/index/index.vue b/pages/index/index.vue index 41ef021..5a860fc 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -78,10 +78,11 @@ 常用工具 - + {{item.name}} @@ -91,27 +92,28 @@ v-else-if="isgShow&&userInfoData.mer_info.setting_status==1&&userInfoData.mer_info.type_code=='PersonalStore'"> + {{item.name}} - - + --> + - + {{item.name}} - + @@ -417,8 +419,10 @@ merstreet, getUserInfo, getAdminApplyAPI, - progressBankList + progressBankList, + isNewMer } from '@/api/user.js'; + import { business, intention, @@ -446,6 +450,8 @@ }, data() { return { + subNVue: '', + elInfo: {}, isAuto: false, //没有授权的不会自动授权 isShowAuth: false, //是否隐藏授权 loadEndFlag: false, @@ -510,11 +516,11 @@ type: 1, image: require('@/static/images/index7.png') }, - { - name: '入库管理', - type: 13, - image: require('@/static/images/index9.png') - }, + // { + // name: '入库管理', + // type: 13, + // image: require('@/static/images/index9.png') + // }, // { // name: '供货采购', // type: 3, @@ -611,11 +617,11 @@ type: 1, image: require('@/static/images/index7.png') }, - { - name: '入库管理', - type: 13, - image: require('@/static/images/index9.png') - }, + // { + // name: '入库管理', + // type: 13, + // image: require('@/static/images/index9.png') + // }, { name: '订单管理', type: 2, @@ -691,11 +697,11 @@ type: 1, image: require('@/static/images/index7.png') }, - { - name: '入库管理', - type: 13, - image: require('@/static/images/index9.png') - }, + // { + // name: '入库管理', + // type: 13, + // image: require('@/static/images/index9.png') + // }, { name: '订单管理', type: 2, @@ -838,6 +844,7 @@ }, async onLoad() { + this.subNVue = uni.getSubNVueById('concat') this.Fheight = uni.getSystemInfoSync().windowHeight + 'px'; await this.$onLaunched; this.list1(); @@ -846,6 +853,13 @@ this.$u.sleep(5000).then(() => { this.loadEndFlag = true; }); + uni.$on('diverIndexSubEmit', () => { + this.subNVue.hide() + uni.navigateTo({ + url: '/pages/product/list/index' + }) + + }) }, onReachBottom() { @@ -856,11 +870,36 @@ }, 10) } }, + onReady() { + // if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) { + // isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => { + // if (res.data == 'true') { + // let that = this + // const query = uni.createSelectorQuery().in(this); + // query + // .select(".tools-two-img") + // .boundingClientRect((data) => { + // let info = JSON.stringify(data) + // that.elInfo = data + // // #ifdef APP-PLUS + // that.openDiver() + // // #endif + // }) + // .exec(); + // } + // }) + // } + + + }, onShow() { if (this.loadEndFlag) { this.codelist(); this.getUserInfo(); + } else { + this.isNewUser() + console.log('1111111111') } // this.getGoods(true); }, @@ -871,6 +910,56 @@ }, methods: { + isNewUser(data) { + let user; + if (data) { + user = data + } else { + user = this.$store.state.app.userInfo + } + setTimeout(() => { + if (Boolean(user.service?.mer_id)) { + isNewMer(user.uid, user.service + ?.mer_id).then( + res => { + if (res.data == 'true' && this.elInfo) { + let that = this + setTimeout(() => { + const query = uni.createSelectorQuery().in(this); + query + .select(".tools-two-img") + .boundingClientRect((data) => { + let info = JSON.stringify(data) + that.elInfo = data + // #ifdef APP-PLUS + that.openDiver() + // #endif + }) + .exec(); + }, 500) + } + }) + } + }, 500) + }, + test1() { + isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => { + console.log(res, 'res') + }) + + }, + + test2() { + isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id, { + done: 1 + }).then(res => { + console.log(res, 'res') + }) + }, + openDiver() { + this.subNVue.show('zoom-out', 300) + uni.$emit('diverIndexEmit', this.elInfo); + }, // 提现页面 handleToWithDraw(item, index) { if (index == 4) return; @@ -1295,6 +1384,7 @@ this.userid = res.data.uid this.userInfoData = res.data; this.$store.commit('SET_USERINFO', res.data); + this.isNewUser(res.data) this.merchantData.phone = res.data.phone; if (res.data.mer_info.is_company == 0) !this.merchantData.company_name ? this.merchantData .company_name = "" : null; diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue new file mode 100644 index 0000000..c25eca3 --- /dev/null +++ b/pages/index/subnvue/concat.nvue @@ -0,0 +1,247 @@ + + + + + \ No newline at end of file diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue index 8e62c49..c4b9e34 100644 --- a/pages/nongKe/gather/select_warehouse.vue +++ b/pages/nongKe/gather/select_warehouse.vue @@ -1,14 +1,14 @@