diff --git a/App.vue b/App.vue index f5b558c..bf1898f 100644 --- a/App.vue +++ b/App.vue @@ -92,12 +92,20 @@ console.log('消息成功' + JSON.stringify(option)); }); - uni.onHostEventReceive((event, data) => { if (event == 'tocustomlist') { - uni.switchTab({ - url: '/pages/chat/customer_list/index' - }); + Toast("收到消息") + Toast(JSON.stringify(event)) + Toast(JSON.stringify(data)) + if (data.page_type == 1) { + uni.switchTab({ + url: data.route + }); + } else { + uni.navigateTo({ + url: data.route + }) + } } }); diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue index 7549749..7a3e5b6 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue @@ -19,9 +19,9 @@ - + - + {{item.merchant.type_name}} {{item.store_name}} {{item.rate}} - {{item.reply_count}}条评论 + style="font-size: 23rpx;font-weight: 600;color: #F84221;margin-right: 28rpx;">{{item.rate}} + {{item.reply_count}}条评论 + ￥ @@ -59,14 +60,14 @@ ￥{{item.svip_price}} - + - + {{item.merchant.type_name}} 领券 包邮 - + {{item.merchant.mer_name}} diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue index 81ce532..0c5a0e9 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue @@ -82,9 +82,8 @@ .item-info {} .title { - + font-size: 30rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #333333; margin: 12px 0; @@ -110,7 +109,6 @@ border-radius: 11rpx 11rpx 11rpx 11rpx; border: 1px solid #3274F9; font-size: 19rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; margin-right: 15rpx; } @@ -125,7 +123,6 @@ border-radius: 11rpx 0px 0px 0rpx; border: 1px solid #F84221; font-size: 19rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; } @@ -136,7 +133,6 @@ border-radius: 0px 11rpx 11rpx 0px; border: 1px solid #F84221; font-size: 19rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; } } @@ -161,7 +157,6 @@ .relase-two { font-size: 23rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 500; color: #B3B3B3; margin-left: 13rpx; @@ -201,7 +196,6 @@ opacity: 1; font-size: 23rpx; padding-left: 11rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #737373; diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue index f6d8ee6..7cc3fd7 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue @@ -64,8 +64,8 @@ width: 100% !important; height: 345rpx; - image{ - width: 100% ; + image { + width: 100%; height: 345rpx; } } @@ -94,7 +94,6 @@ .title { font-size: 30rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #333333; margin: 12px 0; diff --git a/components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue b/components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue index ae4b68a..2876bfc 100644 --- a/components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue +++ b/components/WaterfallsFlowItemSupply/WaterfallsFlowItem.vue @@ -19,7 +19,7 @@ - + - + {{item.merchant.mer_name}} diff --git a/components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue index 81ce532..0c5a0e9 100644 --- a/components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue +++ b/components/WaterfallsFlowItemSupply/WaterfallsFlowItemo.vue @@ -82,9 +82,8 @@ .item-info {} .title { - + font-size: 30rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #333333; margin: 12px 0; @@ -110,7 +109,6 @@ border-radius: 11rpx 11rpx 11rpx 11rpx; border: 1px solid #3274F9; font-size: 19rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; margin-right: 15rpx; } @@ -125,7 +123,6 @@ border-radius: 11rpx 0px 0px 0rpx; border: 1px solid #F84221; font-size: 19rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; } @@ -136,7 +133,6 @@ border-radius: 0px 11rpx 11rpx 0px; border: 1px solid #F84221; font-size: 19rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; } } @@ -161,7 +157,6 @@ .relase-two { font-size: 23rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 500; color: #B3B3B3; margin-left: 13rpx; @@ -201,7 +196,6 @@ opacity: 1; font-size: 23rpx; padding-left: 11rpx; - font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #737373; diff --git a/components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue b/components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue index f6d8ee6..7cc3fd7 100644 --- a/components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue +++ b/components/WaterfallsFlowItemSupply/WaterfallsFlowItems.vue @@ -64,8 +64,8 @@ width: 100% !important; height: 345rpx; - image{ - width: 100% ; + image { + width: 100%; height: 345rpx; } } @@ -94,7 +94,6 @@ .title { font-size: 30rpx; - font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; color: #333333; margin: 12px 0; diff --git a/components/content-bootom/index.vue b/components/content-bootom/index.vue index f193dde..e34af98 100644 --- a/components/content-bootom/index.vue +++ b/components/content-bootom/index.vue @@ -55,8 +55,6 @@ font-size: 30rpx; - font-family: PingFang SC-Regular, - PingFang SC; font-weight: 400; color: #333333; } diff --git a/components/copyPassword/index.vue b/components/copyPassword/index.vue index b82fa85..bd2cef4 100644 --- a/components/copyPassword/index.vue +++ b/components/copyPassword/index.vue @@ -38,7 +38,9 @@ // #ifdef H5 import ClipboardJS from "@/plugin/clipboard/clipboard.js"; // #endif - import { mapGetters } from "vuex"; + import { + mapGetters + } from "vuex"; export default { props: { isCopy: { @@ -56,22 +58,22 @@ title: '复制以下口令' }; }, - mounted(){ + mounted() { let that = this // #ifdef H5 that.$nextTick(function() { var clipboard = new ClipboardJS('.copy-data'); clipboard.on('success', function(e) { that.$util.Tips({ - title:'复制成功' + title: '复制成功' }) - setTimeout(()=>{ + setTimeout(() => { that.$emit('close'); - },500) + }, 500) }); clipboard.on('error', function(e) { that.$util.Tips({ - title:'复制失败' + title: '复制失败' }) }); }); @@ -79,16 +81,18 @@ }, methods: { //#ifndef H5 - copyText:function(){ + copyText: function() { let that = this; - uni.setClipboardData({ data: this.copyUrl }); - setTimeout(()=>{ + uni.setClipboardData({ + data: this.copyUrl + }); + setTimeout(() => { that.$emit('close'); - },500) + }, 500) }, // #endif - close: function(){ - this.$emit('close'); + close: function() { + this.$emit('close'); } } } @@ -106,13 +110,15 @@ transform: translate3d(0, 100%, 0); transition: all .1s cubic-bezier(.25, .5, .5, .9); padding: 50rpx 30rpx 30rpx; - .icon-guanbi{ + + .icon-guanbi { position: absolute; top: 20rpx; right: 20rpx; color: #8A8A8A; } - .button{ + + .button { height: 76rpx; border-radius: 38rpx; margin: 30rpx 30rpx 0; @@ -120,28 +126,31 @@ font-size: 30rpx; line-height: 76rpx; color: #FFFFFF; - } + } } + .copy-list-window.on { transform: translate3d(0, 0, 0); } + .copy-list-window .title { width: 100%; text-align: center; font-size: 32rpx; font-weight: bold; - font-family: 'PingFang SC'; + .iconfont { font-size: 30rpx; color: #FBB324; margin-right: 12rpx; } } - .copy-url{ + + .copy-url { margin-top: 30rpx; background: #F5F5F5; padding: 20rpx 25rpx; color: #BBBBBB; font-size: 28rpx; } - + \ No newline at end of file diff --git a/components/cx-navTitle.vue b/components/cx-navTitle.vue index 6382788..1b6d1a6 100644 --- a/components/cx-navTitle.vue +++ b/components/cx-navTitle.vue @@ -78,7 +78,6 @@ padding-right: 0rpx; scroll-behavior: smooth; //平稳的滑动效果 font-size: 32rpx; - font-family: PingFang-SC-Heavy; .my-tab-item { padding: 20rpx 35rpx; //标签上下左右距离 -- 在这里改 @@ -89,7 +88,6 @@ &.active { color: #333333; //标签选中颜色 -- 在这里改 - font-family: PingFang-SC-Heavy; font-weight: 600; position: relative; @@ -110,7 +108,6 @@ position: relative; z-index: 9; font-size: 32rpx; - font-family: PingFang SC; font-weight: 500; color: #F84221; color: #F84221; 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/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/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 f472dd1..04049ab 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,5 @@