From 802356f1ae11a13a5e600de5f791b2fa69c790ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=97=9C=E8=A1=80=E9=BE=99=E5=B8=85?= <1493694146@qq.com> Date: Thu, 14 Sep 2023 19:48:49 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/nongKe/supply_chain/supplier.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 1a8578b..279caa0 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -36,7 +36,7 @@ - + From 31a5da396bff5982256d076248c88a66ea0bb292 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Mon, 18 Sep 2023 19:06:36 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E4=BE=9B=E9=94=80=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E4=BA=91=E5=B8=82=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 +- components/zbpSwiper.vue | 18 +- config/app.js | 4 +- pages.json | 41 +++-- pages/nongKe/cloud_entrepot/index.vue | 218 ++++++++++++++++++++++--- pages/nongKe/supply_chain/supplier.vue | 183 ++++++++++++++++++++- pages/supply_chains/supply_chains.vue | 2 +- static/images/GXSC/SL.png | Bin 0 -> 1306 bytes static/images/GXSC/XL.png | Bin 0 -> 1329 bytes 9 files changed, 407 insertions(+), 63 deletions(-) create mode 100644 static/images/GXSC/SL.png create mode 100644 static/images/GXSC/XL.png diff --git a/App.vue b/App.vue index 951f3f5..ccf1435 100644 --- a/App.vue +++ b/App.vue @@ -215,7 +215,7 @@ }, onShow() { - + let that = this // 记录H5和公众号 if (this.$store.state.app.token) { @@ -244,7 +244,7 @@ // #endif }, mounted() { - + }, methods: { diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index a0a1e90..1197dc4 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -67,14 +67,14 @@ type: Boolean, default: false }, - location_Arr: { - type: Object, - default: () => ({}) - }, - town: { - type: String, - default: false - }, + // location_Arr: { + // type: Object, + // default: () => ({}) + // }, + // town: { + // type: String, + // default: false + // }, }, data() { @@ -130,7 +130,7 @@ }, selectLocation() { this.isSelectPlace ? this.showPicker = true : '' - + console.log(this.columnData) }, confirm(e) { diff --git a/config/app.js b/config/app.js index 8036f9b..adddc06 100644 --- a/config/app.js +++ b/config/app.js @@ -9,8 +9,8 @@ let httpApiThree // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' // 测试 if (process.env.NODE_ENV === "development") { - // httpApi = 'https://shop.lihaink.cn' // 生产 -httpApi = "https://crmeb-test.shop.lihaink.cn" + // httpApi = 'https://shop.lihaink.cn' // 生产 + httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "http://192.168.0.222" // httpApi = "http://192.168.0.108:8325" // httpApi = 'http://192.168.0.108:8325' diff --git a/pages.json b/pages.json index de765b2..7575445 100644 --- a/pages.json +++ b/pages.json @@ -128,26 +128,25 @@ "enablePullDownRefresh": false } + }, { + "path": "uni_modules/guyue-updater/pages/updater", + "style": { + "app-plus": { + "animationDuration": 200, + "animationType": "fade-in", + "background": "transparent", + "backgroundColorTop": "transparent", + "bounce": "none", + "popGesture": "none", + "scrollIndicator": false, + "titleNView": false + }, + "backgroundColor": "transparent", + "disableScroll": true, + "navigationStyle": "custom" + } } - ,{ - "path": "uni_modules/guyue-updater/pages/updater", - "style": { - "app-plus": { - "animationDuration": 200, - "animationType": "fade-in", - "background": "transparent", - "backgroundColorTop": "transparent", - "bounce": "none", - "popGesture": "none", - "scrollIndicator": false, - "titleNView": false - }, - "backgroundColor": "transparent", - "disableScroll": true, - "navigationStyle": "custom" - } -} -], + ], "subPackages": [{ "root": "pages/goods_cate", "name": "goods_cate", @@ -1625,7 +1624,7 @@ "iconPath": "static/tabbar_icon/c.png", "selectedIconPath": "static/tabbar_icon/c-a.png", "text": "发布" - + }, { "pagePath": "pages/supply_chains/supply_chains", @@ -1641,7 +1640,7 @@ "text": "我的" } ] - + diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 2b81a0b..1a4ab2a 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -19,23 +19,54 @@ - - - - - - - {{town}}里海云仓 + + + + + + + {{town}}里海云仓 + + + + + + + + {{street}} + + + + 全部 + + + + + - - - 全部 + + +
+ + 供销综合云市场 + + + 供销综合云商品 + + + + + + + @@ -175,7 +206,7 @@ - + 暂无商品 @@ -251,7 +282,7 @@ - + 当前区域暂无云仓 @@ -315,7 +346,8 @@ - + @@ -350,13 +382,27 @@ import { goShopDetail } from '@/libs/order.js' + // 7200 = 8 = 80000 8616 import { postCartAdd, } from '@/api/store.js'; import authorize from '@/components/Authorize'; + + import { + getArea, + getStreet + } from '@/api/article.js'; + import { + getIndexData, + getDiy + } from '@/api/api.js' + import { + getGeocoder + } from '@/api/store.js'; import { mapGetters - } from "vuex"; + } from 'vuex' + import Cache from '@/utils/cache'; export default { components: { authorize, @@ -368,6 +414,8 @@ }, + showPicker: false, + columnData: [], skusize: 0, skuNumber: 1, showcartpop: false, @@ -383,10 +431,12 @@ isEmpty: false, winHeight: 0, cloudList: [], + street: '', street_code: '', totalMoney: 0, town: '', list: [1, 1, 1, 1, 1], + showSelect: false, showPop: false, keyword: "", showLoading: false, @@ -430,6 +480,8 @@ this.street_code = e.street this.town = e.town this.getCloundShop() + this.street = e.town + this.Area() // console.log(this.appInfo, "手机信息") }, onShow() { @@ -522,6 +574,102 @@ // }, methods: { + swiperClick(item) { + const url = item.info[1].value + uni.navigateTo({ + url: url + }) + }, + selectLocation() { + this.isSelectPlace ? this.showPicker = true : '' + console.log(this.columnData) + }, + + confirm(e) { + + this.showPicker = false + this.$emit('selectPlce', e) + this.$emit('change', e) + this.street = e.value[1].name + this.$nextTick(() => { + this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); + + }) + this.street_code = e.value[1].code + + this.getCloundShop() + + + + }, + changeHandler(e) { + const { + columnIndex, + value, + values, + index, + picker = this.$refs.uPicker + } = e; + if (columnIndex === 0) { + getStreet({ + area_code: value[0]['code'] + }).then(res => { + picker.setColumnValues(1, res.data); + }); + } + }, + Area() { + getArea({ + city_code: 510500 + }).then(res => { + this.$refs.uPicker.setColumnValues(0, res.data); + this.Street(res.data[0]['code']); + }); + }, + Street(code) { + getStreet({ + area_code: code + }).then(res => { + this.$refs.uPicker.setColumnValues(1, res.data); + }); + }, + + swiperChange(e) { + let { + current, + source + } = e.detail; + if (source === 'autoplay' || source === 'touch') { + this.bgColor = this.swiper.url[e.detail.current]['img'] + this.$emit('kkchange', this.bgColor) + } + }, + + + // 对象转数组 + objToArr(data) { + let obj = Object.keys(data).sort(); + let m = obj.map(key => data[key]); + return m; + }, + async getBanner(id) { + let that = this; + const { + data + } = await getDiy({ + id: 0 + }) + that.styleConfig = that.objToArr(data.value); + /* 循环数组得到数据*/ + that.styleConfig.forEach((item, index, arr) => { + if (item.name == 'headerSerch' || item.name == 'homeComb') { + if (item.name == 'homeComb') { + that.swiper.url = item.swiperConfig.list + } + } + }) + this.bgColor = this.swiper.url[0].img + }, skusizechange(i) { this.skusize = i @@ -786,6 +934,34 @@ } } + .selected-list { + padding: 24rpx 14rpx; + border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx; + background-color: #fff; + position: absolute; + left: 100rpx; + font-size: 29.79rpx; + z-index: 9999; + top: 100rpx; + + + + .triangle-up { + width: 0; + height: 0; + border-left: 10rpx solid transparent; + border-right: 10rpx solid transparent; + border-bottom: 10rpx solid white; + position: absolute; + top: -10rpx; + } + + .selected-li { + margin-bottom: 35rpx; + } + } + + .sku { padding: 20rpx; @@ -1019,7 +1195,7 @@ margin-left: 20rpx; font-size: 40rpx; // font-weight: 700; - transform: skewX(-10deg); + // transform: skewX(-10deg); } @@ -1029,7 +1205,7 @@ .head { position: fixed; - z-index: 100; + z-index: 999; color: white; display: flex; justify-content: space-between; @@ -1068,6 +1244,10 @@ } + .town_name { + margin-right: 20rpx; + } + .goods_list { min-height: 95vh; padding: 0 10rpx; diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 1a8578b..8e9ccef 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -14,29 +14,51 @@ - + 供销综合云市场 + + + + - + + + + {{street}} + +
+ + 供销综合云市场 + + + 供销综合云商品 + + + + - + @@ -274,6 +296,11 @@ + + + + @@ -303,6 +330,18 @@ configMap } from '@/utils'; import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'; + import { + getArea, + getStreet + } from '@/api/article.js'; + import { + getIndexData, + getDiy + } from '@/api/api.js' + + + + import Cache from '@/utils/cache'; const app = getApp(); export default { components: { @@ -312,6 +351,8 @@ }, data() { return { + defaInd: [0, 0], + columnData: [], imgList: [ "/static/images/GXSC/BBY.png", "/static/images/GXSC/NYSC.png", @@ -331,6 +372,7 @@ "/static/images/GXSC/JDMS.png", ], street_id: "", + showSelect: false, price: 0, stock: 0, nows: false, @@ -348,6 +390,8 @@ downKey: 0, downStatus: false, menuList: [], + street: "", + showPicker: false, // 下拉菜单 downMenu: [{ title: '默认', @@ -406,6 +450,7 @@ onLoad(options) { // console.log(options); this.street_id = options.street_id + this.street = options.townName this.product_type = options.product_type ?? 0 if (options.street_id != undefined) { this.sotreParam.street_id = options.street_id @@ -424,7 +469,7 @@ supMenuApi().then(res => { this.menuList = res.data }) - + this.Area() }, computed: { downMenus: function() { @@ -445,6 +490,96 @@ }, mapGetters(['viewColor'])), }, methods: { + selectLocation() { + this.isSelectPlace ? this.showPicker = true : '' + + }, + + confirm(e) { + this.showPicker = false + this.$emit('selectPlce', e) + this.$emit('change', e) + console.log(e) + this.street = e.value[1].name + this.$nextTick(() => { + this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); + + }) + + this.sotreParam.street_id = e.value[1].code + this.street_id = e.value[1].code + this.storeMerchantList() + + }, + changeHandler(e) { + const { + columnIndex, + value, + values, + index, + picker = this.$refs.uPicker + } = e; + if (columnIndex === 0) { + getStreet({ + area_code: value[0]['code'] + }).then(res => { + picker.setColumnValues(1, res.data); + }); + } + }, + Area() { + getArea({ + city_code: 510500 + }).then(res => { + this.$refs.uPicker.setColumnValues(0, res.data); + this.Street(res.data[0]['code']); + }); + }, + Street(code) { + getStreet({ + area_code: code + }).then(res => { + this.$refs.uPicker.setColumnValues(1, res.data); + }); + }, + + swiperChange(e) { + let { + current, + source + } = e.detail; + if (source === 'autoplay' || source === 'touch') { + this.bgColor = this.swiper.url[e.detail.current]['img'] + this.$emit('kkchange', this.bgColor) + } + }, + + + // 对象转数组 + objToArr(data) { + let obj = Object.keys(data).sort(); + let m = obj.map(key => data[key]); + return m; + }, + async getBanner(id) { + let that = this; + const { + data + } = await getDiy({ + id: 0 + }) + that.styleConfig = that.objToArr(data.value); + /* 循环数组得到数据*/ + that.styleConfig.forEach((item, index, arr) => { + if (item.name == 'headerSerch' || item.name == 'homeComb') { + if (item.name == 'homeComb') { + that.swiper.url = item.swiperConfig.list + } + } + }) + this.bgColor = this.swiper.url[0].img + }, + test() { if (this.sotreParam.keyword.length > 3) { this.sotreParam.keyword.slice(0, 3) @@ -462,6 +597,11 @@ url }) }, + navGoto(url) { + uni.redirectTo({ + url + }) + }, navGo(id) { uni.navigateTo({ url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}` @@ -644,7 +784,7 @@ // console.log(rqData) storeMerchantList(rqData).then(res => { this.count = res.data.count - this.storeList = this.storeList.concat(res.data.list) + this.storeList = (res.data.list) this.loading = false this.loadingIcon = false }) @@ -674,7 +814,7 @@ this.rightBox = true }, // 组件确定 - confirm(data) { + confirm1(data) { let arr1 = [], arr2 = [] if (data.storeTypeArr.length == 0) { @@ -1086,6 +1226,31 @@ margin-left: 10rpx; } + .selected-list { + padding: 24rpx 14rpx; + border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx; + background-color: #fff; + position: absolute; + left: 100rpx; + font-size: 29.79rpx; + + + + .triangle-up { + width: 0; + height: 0; + border-left: 10rpx solid transparent; + border-right: 10rpx solid transparent; + border-bottom: 10rpx solid white; + position: absolute; + top: -10rpx; + } + + .selected-li { + margin-bottom: 35rpx; + } + } + .store-wrapper { margin-top: 235rpx; border-top: 1px solid #F6F6F6; diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index 9f4d616..d2f1f08 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -24,7 +24,7 @@ + :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}&townName=${town}`"> diff --git a/static/images/GXSC/SL.png b/static/images/GXSC/SL.png new file mode 100644 index 0000000000000000000000000000000000000000..7b1663cd84f6577f43c90ee7c872a5747b85d896 GIT binary patch literal 1306 zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yjKx9jP7LeL$-HD>V7cPy;uum9 z_x5INwoIxB`-kFrH;=Z7i^b3dXk@G*{I2RFlnjylyv^BEE} zIhu^m6ia*5EJ>L6{I0vpdZq*29TssVZ7x?_j%;UqV48fUpZVg386_z|`MsJMWtPP-^}SaWYO2(l31~GdgYGfcCKYx%ccgs+?>(0 z`=Z&;`wR&OB_4mz+}C%Rhj&fX+OVlX>4Js%2iNUWSajK?WMW5@*GhN6j|L1jkp|DK z1ke87mv1#MSDwk4u{bu|x^HsQ+mpAA1^0G#td~x%JNbL}^U8AO1KOz$r1=YQ|3KlRLI>oxbOLGKw3tXo^D^sBprkJYi@VA{Go zV`kRNQTEepH-FlYr{ej^M}Q^1$ZY*qyM~VWN{`+JF5u#hF%rVXVrU4FGbt#R;ZL$%B;R@x@(t$Yep@*_r^`P3v`}O z`)ON!u4V4JC1>w%y>_`{$DL=B%M~(eS+x%_HDr5EI>YMtVJ&Z4u9|DG*V6L`Zx+qIq#a=7>855#6Gd%DTaowCK5x1rF!IPNlwJSojmd-y?{%p%Hd8MkZ-w!Y4 z{oQ8*a;Cq)$7yp~*KLVf%iQbsxSEg2JbGn_oW@kI=K_WI6)sk>U5=7>J2JU4!llHr zYf*Fav0E&s?$ynaSBdgZ(3}?ZN|{09dCXOLfx@yI>ywPOsJiUg?|XS3Z_@+gyk_&y zvCX21j0eg+C&}m*|Cu>hVCHu6<@~=Y0j`;ZW5}Ah?^Hocwb4_T$_6jE+S_Mzmf!X?xz9 zlfm6gTxpSUN5vJ1&)dKDl{;(*TG=z*Yv~vF89V>aIbFT){r-f_w%Hrjq#p0guveOA zdTdYP<^z6buVig~d^4Z*^y}BJ)vsNFVdQ&MBb@0LzzDfdBvi literal 0 HcmV?d00001 diff --git a/static/images/GXSC/XL.png b/static/images/GXSC/XL.png new file mode 100644 index 0000000000000000000000000000000000000000..c32307572d037e763df385bc5c91593c99531efc GIT binary patch literal 1329 zcmb7E{a2C)7=1BHWz#e)5#dyZm}#kpB9|XaeAQIMLKn_2sJ7II9FiTi6ht$Oq?S>B zkHn8-31LQq%%n6)Ct4b`FsI3MW|`Yb=LeEwe?reW&%Ni|`@=oY{oyG-ND8xoAz=Uj z*n}Sd$z~@0zgFwasJ?N?!%PqsIg9{E`%&)z0Qx>042sQ4o+*!{W4?1x4=A-IVzjes z?YIc;S~e!WecMA+fZdAS0k1XmmuwEQA5q#ba77;9auOcDT12`Plyj_NGTWT77^H)% z?eTLP;00$g(aJ%an=#do8kdDnn;5IJ*()DcUmEb-L{E!nWIh6l7=l_5IX>3j6XV{H zZj9<0zY~fm1!8vD!f8YcqSE(^%~Lb7mX;Q{SSWPprDT{`x4a=AB~^+;2Z*I zE;_RKfWg$MBI*Y(@Dwk|v~*?Y_~4^erw!{QUXV5O8zhkt|(9Af5JT zHin?mnoK4folbAV_Y_Io9bn3nc%wVuuaA$kgC6#52C<4+V+WwxX&uFGZ)-Cyc6WDE zJJ)5zel9L9b`A>-?O&q`mh5wRfGm0&Ub!sE&#qaxN1is-iNMp@DJdy=EEY?ReJ9#u zFc_B31+pRbjru>6VcfB*s3e_=C_CDsnDQ0mUk|rRmcDw=n#fp+uIwrpbl^X&M5&dj zz0uE{wD0Fz&HAz7oH&)IDCza^aAgvex~jR)$(zQyxrMQmZ*BlTvAt;Jh?6u+QM)DZ zx{!cBA=eY-@$I^3MDzeNXV>OsKCd%uCq~k!T-yRw1Id94mtg_~gsdt~RPcmfxfsSa3G;xGE znDzK$RYknbTgNjcQ5#-FA99GI+}6$xS&TJ*%3a;%5+BqRV=Z3^1|!p|wett=@2?E$ z8n`NgsLnWq;Diwq&ZJL?jGG4)ex*H$gs$M(81M&LK$9H5o+Fh?L+@^^AWy>qMc~a^ zs(5=&9rbzQtMFql0re8h(^`8x_zs4jD zQl90Z)G0Y{n`;DhJ9oP*7w{(U>4eGqaWXsRM*DOUFNLO|OEg1wQz!%GFr-VKfVa(B z_;EK<`6kM-<}W2Li+M$s6L@v!^9H01ni~qXfpegKWWhiEme2B1;n~BK7C**ODoRH@ zfuvj70OS#>|A5~}e|t%Z_qI{t*~?rVg@$EX?p=ul@1#mbr|z{*E|8n%{9P)BUck*K zP~vjYJ=gy^EhJC2uu}^!33z?RA=b}zahn2b$ZLv6bTv?r<{;G%C-Zp4?o1!znfUt zesR+d;YCubucjj30=M>o^z0zBip861a9>nacmOirsmsRvHFW$3fu&PwoPcMe`>YD+L`3C~wAtX>rpmF~LDMx2a literal 0 HcmV?d00001 From e70850d2fa3a320318a81f75d7a52c3efa9f422b Mon Sep 17 00:00:00 2001 From: THK3121 Date: Tue, 19 Sep 2023 15:20:05 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E4=BA=91=E4=BB=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/nongKe/cloud_entrepot/index.vue | 482 ++++++++++++------------- pages/nongKe/supply_chain/supplier.vue | 89 +++-- static/images/GXSC/BSL.png | Bin 0 -> 1109 bytes static/images/GXSC/SS.png | Bin 5886 -> 2792 bytes static/images/GXSC/SSBT.png | Bin 0 -> 5886 bytes static/images/GXSC/XZ.png | Bin 0 -> 942 bytes 6 files changed, 298 insertions(+), 273 deletions(-) create mode 100644 static/images/GXSC/BSL.png create mode 100644 static/images/GXSC/SSBT.png create mode 100644 static/images/GXSC/XZ.png diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 760c1ff..644c650 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -16,33 +16,34 @@ --> - - + - - + + - + - - + {{town}}里海云仓 - - + - + - {{street}} + {{street}} - 全部 + 全部 @@ -50,16 +51,17 @@ - +
- 供销综合云市场 - - 供销综合云商品 + + 供销综合云商品 + - @@ -67,8 +69,6 @@ - - @@ -98,8 +98,8 @@ - - + + - + - - - - - {{item.tit}} - - - - + + + + {{item.tit}} + + + - - - - - - - - - - - - {{item.store_info}} - - - - {{item.rate}} - {{item.reply_count}}评论 - - - - - ￥{{item.price}} - - - ￥30.00 - - - - - - - - - - - - - - - - - - + + + + - - - - - - - 暂无商品 - - - - - - + - - - - - {{goodsNum}} - - - - - ￥{{totalMoney}} - - - 支持配送 售后无忧 - - + - 去结算 + + + {{item.store_info}} + + + + {{item.rate}} + {{item.reply_count}}评论 + + + + + ￥{{item.price}} + + + ￥30.00 + + + + + + + + + + + + + + + + + + + + + + + + 暂无商品 + - + + + + + + + + {{goodsNum}} + + + + + ￥{{totalMoney}} + + + 支持配送 售后无忧 + + + + + 去结算 + + + + - - - - - - - - 里海云仓 + + + + + + + + 里海云仓 + - - - - - - - {{item.category_name}}云仓服务 - - - {{item.description}} + + + + + + {{item.category_name}}云仓服务 + + + {{item.description}} + - + + + - + - - - + --> + - - - 当前区域暂无云仓 + + + 当前区域暂无云仓 + + + + + + + + + + + - - - - - + + + + @@ -313,8 +318,6 @@ - - 尺码 @@ -323,7 +326,6 @@ {{item.sku}} - @@ -335,9 +337,7 @@ - 确定 - @@ -345,20 +345,6 @@ - - - - - - - - - - - - - @@ -410,10 +396,8 @@ data() { let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13'; return { - skuform: { - - - }, + skuform: {}, + defaInd: [0, 0], showPicker: false, columnData: [], skusize: 0, @@ -482,10 +466,38 @@ this.getCloundShop() this.street = e.town this.Area() + let that = this + setTimeout(() => { + uni.createSelectorQuery() + .in(this) + .select('.flags') + .boundingClientRect(rect => { + that.headtop = rect.top + }) + .exec(); + uni.createSelectorQuery() + .in(this) + .select('.flags') + .boundingClientRect(rect => { + this.headtop = rect.top + }) + .exec(); + uni.createSelectorQuery() + .in(this) + .select('.cart') + .boundingClientRect(rect => { + // console.log(this.cartTagInfo, 6666) + this.cartTagInfo = rect + }) + .exec(); + // console.log(that.headtop) + }, 500) + // console.log(this.appInfo, "手机信息") }, onShow() { this.cartFn() + this.showSelect = false }, // 分页 onReachBottom() { @@ -524,8 +536,6 @@ // } // }) }, - - onPageScroll(e) { let that = this this.showtit = !Boolean(e.scrollTop) @@ -546,22 +556,6 @@ } }) .exec(); - if (this.headtop) return - uni.createSelectorQuery() - .in(this) - .select('.flags') - .boundingClientRect(rect => { - this.headtop = rect.top - }) - .exec(); - uni.createSelectorQuery() - .in(this) - .select('.cart') - .boundingClientRect(rect => { - this.cartTagInfo = rect - }) - .exec(); - }, onPullDownRefresh() { this.getCloundShop() @@ -569,11 +563,12 @@ this.cartFn() uni.stopPullDownRefresh() }, - // onReachBottom() { - // console.log("daidi") - - // }, methods: { + showpick() { + this.showPicker = !this.showPicker + + + }, swiperClick(item) { const url = item.info[1].value uni.navigateTo({ @@ -582,11 +577,10 @@ }, selectLocation() { this.isSelectPlace ? this.showPicker = true : '' - console.log(this.columnData) + }, confirm(e) { - this.showPicker = false this.$emit('selectPlce', e) this.$emit('change', e) @@ -595,11 +589,12 @@ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); }) + + // this.sotreParam.street_id = e.value[1].code this.street_code = e.value[1].code - this.getCloundShop() - - + this.town = e.value[1].name + // this.storeMerchantList() }, changeHandler(e) { @@ -619,11 +614,14 @@ } }, Area() { + let that = this getArea({ city_code: 510500 }).then(res => { + this.$refs.uPicker.setColumnValues(0, res.data); this.Street(res.data[0]['code']); + // console.log(res.data, 66666) }); }, Street(code) { @@ -631,6 +629,7 @@ area_code: code }).then(res => { this.$refs.uPicker.setColumnValues(1, res.data); + }); }, @@ -652,24 +651,6 @@ let m = obj.map(key => data[key]); return m; }, - async getBanner(id) { - let that = this; - const { - data - } = await getDiy({ - id: 0 - }) - that.styleConfig = that.objToArr(data.value); - /* 循环数组得到数据*/ - that.styleConfig.forEach((item, index, arr) => { - if (item.name == 'headerSerch' || item.name == 'homeComb') { - if (item.name == 'homeComb') { - that.swiper.url = item.swiperConfig.list - } - } - }) - this.bgColor = this.swiper.url[0].img - }, skusizechange(i) { this.skusize = i @@ -702,9 +683,8 @@ }, valChange(e) { - console.log(e.value) this.skuNumber = e.value - // this.valChange = e.value + }, closecartpop() { this.showcartpop = false @@ -726,7 +706,7 @@ }, cartFn() { getCartList().then(res => { - console.log(res) + // console.log(res) this.totalMoney = 0 this.cartList = res.data.list this.cartList.forEach(e => { @@ -765,7 +745,6 @@ }) }, serch() { - // console.log(this.keyword) this.getList() }, goBack() { @@ -814,14 +793,12 @@ }, addcart(item, i) { - - // console.log(this.isLogin) if (!this.isLogin) { this.isAuto = true; this.isShowAuth = true return } - // console.log(item.sku[''] ? "1" : "2") + if (item.sku['']) { let data = { cart_num: 1, @@ -831,14 +808,11 @@ product_type: item.product_type, spread_id: "", } - let that = this - // return - uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => { that.trnList[i].left = this.cartTagInfo.left - data1.left; that.trnList[i].bottom = this.cartTagInfo.top - data1.top; - console.log(that.trnList[i]) + let timer = setTimeout(() => { that.trnList[i].left = 0 that.trnList[i].bottom = 0 @@ -858,7 +832,6 @@ }) }).catch(err => { - // this.act_cart = false uni.showToast({ title: err, icon: "none", @@ -873,11 +846,8 @@ this.showcartpop = true const keys = Object.keys(item.sku); const firstKey = keys[0]; - - - // console.log(keys[0]) this.skusize = keys[0] - // console.log(this.skuform) + } return @@ -906,6 +876,7 @@ street_code: this.street_code, category_id: this.cloudList[this.current].category_id }).then(res => { + this.trnList = [] this.goodsList = res.data.list this.goodsList.forEach(item => { this.trnList.push({ @@ -914,8 +885,6 @@ }) }) }) - // console.log(this.cloudList) - data.length < 1 ? Toast("暂无云仓") : ''; } } } @@ -942,7 +911,9 @@ left: 100rpx; font-size: 29.79rpx; z-index: 9999; - top: 100rpx; + // top: 100rpx; + opacity: 0; + transition: 0.5s; @@ -957,7 +928,10 @@ } .selected-li { - margin-bottom: 35rpx; + margin-top: 35rpx; + color: #F84221; + display: flex; + align-items: center; } } @@ -1543,4 +1517,20 @@ display: flex; align-items: center; } + + .sl { + margin-left: 20rpx; + transform: rotate(180deg); + transition: 0.5s; + } + + .actsl { + transform: rotate(0deg); + } + + .actSel { + opacity: 1; + // transform: translateX(100rpx); + + } \ No newline at end of file diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 8e9ccef..2d73a0b 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -17,41 +17,42 @@ 供销综合云市场 - + - + - - + + placeholder="请输入..." v-model="sotreParam.keyword" @search="onInputConfirm" + class="serch_cls"> - --> - + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> + + + + {{street}} - - +
- 供销综合云市场 + 供销综合云市场 供销综合云商品 - @@ -62,8 +63,9 @@ - 热搜: 小张副食 正新酒店 + 热搜: + 小张副食 + 正新酒店 麻辣鸡 手撕椒麻鸡 @@ -297,7 +299,7 @@ - @@ -353,6 +355,7 @@ return { defaInd: [0, 0], columnData: [], + showSerch: false, imgList: [ "/static/images/GXSC/BBY.png", "/static/images/GXSC/NYSC.png", @@ -494,22 +497,18 @@ this.isSelectPlace ? this.showPicker = true : '' }, - confirm(e) { this.showPicker = false this.$emit('selectPlce', e) this.$emit('change', e) - console.log(e) this.street = e.value[1].name this.$nextTick(() => { this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); }) - this.sotreParam.street_id = e.value[1].code this.street_id = e.value[1].code this.storeMerchantList() - }, changeHandler(e) { const { @@ -532,7 +531,8 @@ city_code: 510500 }).then(res => { this.$refs.uPicker.setColumnValues(0, res.data); - this.Street(res.data[0]['code']); + // this.Street(res.data[0]['code']); + // console.log(res.data, 66666) }); }, Street(code) { @@ -540,6 +540,7 @@ area_code: code }).then(res => { this.$refs.uPicker.setColumnValues(1, res.data); + console.log(res.data, 9999) }); }, @@ -554,7 +555,12 @@ } }, + onInputConfirm() { + this.showSerch = false + this.searchSubmit() + + }, // 对象转数组 objToArr(data) { let obj = Object.keys(data).sort(); @@ -584,7 +590,6 @@ if (this.sotreParam.keyword.length > 3) { this.sotreParam.keyword.slice(0, 3) this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..." - console.log(this.sotreParam.keyword) } // console.log(this.sotreParam.keyword.length) }, @@ -807,6 +812,7 @@ let that = this; that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword); this.set_where(this.firstKey) + this.showSerch = false }, // 右侧切换 bindRight() { @@ -877,6 +883,9 @@ onPullDownRefresh() { uni.stopPullDownRefresh() }, + onShow() { + this.showSelect = false + }, //上划加载更多 onReachBottom() { if (this.count === this.storeList.length) { @@ -972,7 +981,7 @@ height: auto; background-color: white; padding: 20rpx; - border-radius: 20rpx; + // border-radius: 20rpx; display: flex; // align-items: center; @@ -1013,6 +1022,11 @@ } } + .selects { + transform: rotate(180deg); + } + + .search-right.styleType2 .right-text, .search-right.styleType3 .right-text { @@ -1041,6 +1055,15 @@ } } + .town_name { + // overflow: hidden; + // white-space: nowrap; + /* 设置文本不换行 */ + // text-overflow: ellipsis; + font-size: 14px; + /* 设置溢出文本为省略号 */ + } + .hot_serch { color: #B3B3B3; display: flex; @@ -1233,7 +1256,9 @@ position: absolute; left: 100rpx; font-size: 29.79rpx; - + opacity: 0; + transition: 0.5s; + height: 0; .triangle-up { @@ -1248,9 +1273,19 @@ .selected-li { margin-bottom: 35rpx; + color: #F84221; + display: flex; + align-items: center; } } + .actSel { + opacity: 1; + height: auto; + // transform: translateX(100rpx); + + } + .store-wrapper { margin-top: 235rpx; border-top: 1px solid #F6F6F6; diff --git a/static/images/GXSC/BSL.png b/static/images/GXSC/BSL.png new file mode 100644 index 0000000000000000000000000000000000000000..ec02426598ced9879f4046c00d6021c05a6570a7 GIT binary patch literal 1109 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 QO8@`>07*qoM6N<$f)vcF*Z=?k literal 0 HcmV?d00001 From 1e901693c3a03a5d00d680474ea92e3ad4994c35 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Tue, 19 Sep 2023 16:17:03 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E4=BA=91=E4=BB=93=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/nongKe/cloud_entrepot/index.vue | 56 ++++++++++++++++++++----- pages/nongKe/supply_chain/supplier.vue | 13 +++--- static/images/GXSC/DW1.png | Bin 0 -> 3007 bytes static/images/GXSC/QB.png | Bin 0 -> 2108 bytes static/images/LHYC/DWB.png | Bin 0 -> 2824 bytes static/images/LHYC/QB.png | Bin 1852 -> 2108 bytes 6 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 static/images/GXSC/DW1.png create mode 100644 static/images/GXSC/QB.png create mode 100644 static/images/LHYC/DWB.png diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 644c650..abb7d68 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -35,13 +35,15 @@ - {{street}} - + 全部 @@ -246,7 +248,7 @@ 里海云仓 - + @@ -260,6 +262,22 @@ + + + + + + + + + 当前区域暂无云仓 + + + + @@ -269,11 +287,8 @@ - - + @@ -507,7 +522,7 @@ this.flag = true cloudWarehouse({ street_code: this.street_code, - category_id: this.cloudList[this.current].category_id, + category_id: this.cloudList[this.current]?.category_id || "", order: this.type, keyword: this.keyword, page_num: this.page_num @@ -775,7 +790,7 @@ this.status = "loading" cloudWarehouse({ street_code: this.street_code, - category_id: this.cloudList[this.current].category_id, + category_id: this.cloudList[this.current]?.category_id || "", order: this.type, keyword: this.keyword, page_num: this.page_num @@ -1168,6 +1183,13 @@ .head_tit { margin-left: 20rpx; font-size: 40rpx; + // background-color: red; + width: 40vw; + white-space: nowrap; + overflow: hidden; + + text-overflow: ellipsis; + // font-weight: 700; // transform: skewX(-10deg); } @@ -1219,7 +1241,14 @@ } .town_name { - margin-right: 20rpx; + margin-right: 50rpx; + // background-color: red; + max-width: 15vw; + white-space: nowrap; + + overflow: hidden; + + text-overflow: ellipsis; } .goods_list { @@ -1533,4 +1562,11 @@ // transform: translateX(100rpx); } + + .yuncangempty { + margin: 20vh 0; + display: flex; + flex-direction: column; + align-items: center + } \ No newline at end of file diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 2d73a0b..3f6a627 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -36,9 +36,9 @@ - - + {{street}} @@ -1056,10 +1056,11 @@ } .town_name { - // overflow: hidden; - // white-space: nowrap; + overflow: hidden; + white-space: nowrap; /* 设置文本不换行 */ - // text-overflow: ellipsis; + text-overflow: ellipsis; + max-width: 25vw; font-size: 14px; /* 设置溢出文本为省略号 */ } diff --git a/static/images/GXSC/DW1.png b/static/images/GXSC/DW1.png new file mode 100644 index 0000000000000000000000000000000000000000..ec346ae9300594eafd00fa616e1a9cf0c22ff28c GIT binary patch literal 3007 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 Date: Wed, 20 Sep 2023 09:08:56 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/nongKe/supply_chain/supplierA.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue index 155a9f1..10fc11b 100644 --- a/pages/nongKe/supply_chain/supplierA.vue +++ b/pages/nongKe/supply_chain/supplierA.vue @@ -26,7 +26,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> From 701c54745f65c85ffc843fb7b13fe4e1e694c60e Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 20 Sep 2023 09:19:53 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/nongKe/cloud_entrepot/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 8ac621a..d51d48d 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -87,7 +87,7 @@ - From d1366e24255f64407e9b1cf520f0a799b3e99f87 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 20 Sep 2023 14:58:51 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BA=A4=E6=98=93=E7=94=B3=E8=AF=B7=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/gather/gather.vue | 1 + pages/moreProject/moreProject.vue | 11 +- pages/product/basicSet.vue | 23 +- .../transactionApplication/application.vue | 5 +- store/modules/app.js | 61 +- uni_modules/guyue-updater/pages/updater.vue | 599 +++++++++--------- 6 files changed, 359 insertions(+), 341 deletions(-) diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 9f6bc78..37b9398 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -291,6 +291,7 @@ this.getUniMp(data); break; case 2: + this.navigator(data); break; } diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 6273d13..52d9a18 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -1,6 +1,6 @@ @@ -375,12 +378,15 @@ import emptyPage from '@/components/emptyPage.vue'; import zbpSwiper from '@/components/zbpSwiper' import { - + mapGetters } from 'vuex' - import { - + business, + intentionbus + } from "@/api/product" + import { + getUserInfo } from '@/api/user.js' import { @@ -416,11 +422,16 @@ isShow: false, bgColor: '', isFshow: false, - street: '' + street: '', + detail: {}, + tagStyle: { + img: 'width:100%;display:block;' + }, + num: 15 }; }, computed: { - ...mapGetters(['userInfo', 'isLogin']) + ...mapGetters(['userInfo', 'isLogin']) }, created() {}, onLoad() {}, @@ -433,18 +444,95 @@ this.jurisdiction = true } this.getUserInfo() - + this.list() }, - - + + methods: { - navigator(url, t) { - - uni.navigateTo({ - url: url + //同意 + agree() { + intentionbus({ + status: 1 + }).then((res) => { + + if (res.status == 200) { + this.$util.Tips({ + title: res.message, + icon: 'success', + }) + this.getUserInfo() + this.isFshow = false + } + }).catch((err) => { + this.$util.Tips({ + title: err, + icon: 'error', + }) }) }, + //拒绝 + refuse() { + uni.switchTab({ + url: '/pages/gather/gather' + }) + }, + //关闭弹窗 + recuo() { + + if (this.num > 0) { + this.num = 15 + this.isFshow = false + } else { + this.num = 0 + this.isFshow = false + } + + }, + + countDown() { + let { + num + } = this; + // if (num === 3) this.nums = true; + num = num > 0 ? num - 1 : "0"; + setTimeout(() => { + + this.num = num; + if (num == '0') { + // this.launchApp() + return + } + + if (this.isFshow == false && this.num > 0) { + this.num = 15 + return + } + this.countDown(); + }, 1000); + + + }, + //获取协议内容 + list() { + business({ + type: 'mer_settlement_agree' + }).then(res => { + this.detail = res.data + }) + }, + navigator(url, t) { + + if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { + this.isFshow = true + this.countDown() + } else { + uni.navigateTo({ + url: url + }) + } + + }, getUserInfo: function() { let that = this; getUserInfo().then(res => { @@ -473,6 +561,150 @@ background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); } + .settlementAgreement { + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(0, 0, 0, .5); + z-index: 10; + } + + .settlementAgreement .setAgCount { + background: #fff; + width: 656rpx; + // height: 458px; + position: absolute; + top: 50%; + left: 50%; + border-radius: 12rpx; + -webkit-border-radius: 12rpx; + padding: 52rpx; + -webkit-transform: translate(-50%, -50%); + -moz-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + overflow: hidden; + + .content { + height: 900rpx; + overflow-y: scroll; + + /deep/ p { + font-size: 13px; + line-height: 22px; + } + + /deep/ img { + max-width: 100%; + } + } + } + + .settlementAgreement .setAgCount .icon { + font-size: 42rpx; + color: #b4b1b4; + position: absolute; + top: 15rpx; + right: 15rpx; + } + + .settlementAgreement .setAgCount .title { + color: #333; + font-size: 32rpx; + text-align: center; + font-weight: bold; + } + + .settlementAgreement .setAgCount .content { + margin-top: 32rpx; + color: #333; + font-size: 26rpx; + line-height: 22px; + text-align: justify; + text-justify: distribute-all-lines; + height: 756rpx; + overflow-y: scroll; + } + + + .settlementAgreement .setAgCount .contenta { + margin-top: 32rpx; + color: #333; + font-size: 26rpx; + line-height: 22px; + text-align: justify; + text-justify: distribute-all-lines; + + /*#ifdef H5*/ + height: 600rpx; + /*#endif*/ + /*#ifdef APP-PLUS*/ + height: 530rpx; + /*#endif*/ + + overflow-y: scroll; + + + } + + .setAgCountbtn { + display: flex; + justify-content: space-around; + + .setAgCountbtna { + margin-top: 40rpx; + width: 150rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + border-radius: 46rpx 46rpx; + opacity: 1; + border: 2rpx solid #B3B3B3; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #737373; + + } + + .setAgCountbtnb { + margin-top: 40rpx; + padding-left: 20rpx; + padding-right: 20rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + background: #cecece; + border-radius: 46rpx 46rpx; + opacity: 1; + + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + + .setAgCountbtnc { + margin-top: 40rpx; + width: 150rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%); + border-radius: 46rpx 46rpx; + opacity: 1; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + } + + + .bg-img { position: absolute; width: 100%; diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index abb7252..21ffc85 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -47,7 +47,7 @@ - + + + @@ -153,7 +152,7 @@ 商户设置 - + 当地美食 @@ -24,7 +24,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue index 8ed58d4..71ad4dc 100644 --- a/pages/nongKe/specialty/index.vue +++ b/pages/nongKe/specialty/index.vue @@ -11,7 +11,7 @@ - + 名优特产 @@ -27,7 +27,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 3f6a627..c0dea0a 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -14,7 +14,7 @@ - + 供销综合云市场 - + {{titName}} diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue index ca5f9e8..d40a5ea 100644 --- a/pages/nongKe/tourism/index.vue +++ b/pages/nongKe/tourism/index.vue @@ -11,7 +11,7 @@ - + 特色文旅 @@ -27,7 +27,7 @@ + src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx"> diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 21ffc85..ae8de1f 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -47,12 +47,12 @@ - + @@ -60,12 +60,12 @@ src="../static/images/product_specification.png"> 规格模板 - + @@ -124,9 +124,9 @@ - + 线下入库 diff --git a/static/images/LHYC/DWB1.png b/static/images/LHYC/DWB1.png new file mode 100644 index 0000000000000000000000000000000000000000..ec346ae9300594eafd00fa616e1a9cf0c22ff28c GIT binary patch literal 3007 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 F{y&L2k{AF0 literal 0 HcmV?d00001 diff --git a/static/images/LHYC/QB1.png b/static/images/LHYC/QB1.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3267011e1b8a7c7696114ecd588d02c3f39e32 GIT binary patch literal 2223 zcmV;g2vGNlP)Px-X-PyuRCr$Po$qzjI1s=k?|YDZB3Hqg3eMOC+$Ie`D!8NqpaMt*CfRIMzx%)sfnn zX9HC}0Clcs)fGVuYf=Gdq0Vp9_!(&RMrj@2m0T-0X&QC3J*z4UajZ!Mph2DA_Tsmo z^np?909T;Z%k7WVi7_o>0s+{gOlx>cGC;v$NQeTk1E34Mg{Y7ay#XdkvNM@Xo&rFk zwN8{$Q^pYjMa=-9(pr~wU7wa^Iru!|11~g0FMvssOrt1zt2-ulW{?U1aJBccD2l=6 z84h?MAvyz0)AWtj`UN*6OL-siJm0rWYn_Y}UMPr80JAK6rj&Ybt(gH50>DvG6tB5N zli&fIDy3qj^&d9n4>>220pgq&MbV|!`erjb;;*jj-LfoazEz;W1AuqiXVn2r z&BlgE2AE|T&Od+oDvc?BndkWvA6YK&z7LNp0FewZP1Bjy`cEIFapukQoZN;*`9APg z1tPieS(X7O0AE?I!zc&5Re(qWm?TLunM^Lalnwx&o2E(1vSd5l&9dx+QtD|>nYgVu zrgQ{OcwACtyT9PQURQ9omF_V66A-L_%+g{ zR_gc8eQg7~+q260fd0M%EFXf}r7j#?Y0rmrtO-|InlLxb^v@K)P0Ul_j-}Wj4 zAP7Vocvw#vLYHXG9dRRlY3$7dL$rkl0O#9h73nB)qb(4@ec6reuD=F?XbTVP>T+|x z`2cOLaIQh#;gkYT0espztI(^D^xJrVb1U47&2!<8O(DyiNP?%-H8ha8xaQvrfT1B$ z;YAHhDJ#!q6TLS8LqQA)58HIF01gc?G`xEWa43jlz;gi@PbQPjeHFf8008q-EW$b~ ziXuFn@7x;!z@dw)J?Fw^EO=yqm|+FI(w>xMX?^sx+;=!2jtS2R;3oNn`VOaK!*d1L z>m^1Q9XXPo=6UXYo8V%J|0xxl4yKnHcX30=*ERZ} zvb-0hKm?^eYk)_6w+bQPIawfPGCBAT2<^LQ03bW`n(9S?Xp+_be=y5il<#DL?P3Op zE_~?n$g(kP$+(}EIWKJbTQoR4XA4}^yM11b5IbGp*{IFWn&DH^GzYG$PTRULSYi-( z-T;?CCQ%gON&4c?R#(P!T5H@}mQB+jH)~e|qhLb<4~W6wu>tf|)~e=rfEW~>0JP{i zEku0%)IZk)d;(C-@g`H~qImF&M;U_C>NsR@pJn|CKw@v2 z!&EAnD0Ss}hes^3H@N`h)aD4X1mFlt=PXhHa%yt~SpskbrE?Z306Dcef-C_zg3>vQ zWCw^h6xtAOee`=y@A*lH}J< zP)6CFhrZ)J4{c+=y~0?hZOl{l7;tU8Q@po4$@Bajq20!$UI4Q!dkz42L(ksmu9^eD zanm$M9KE`YclthL{V{-TUDt$?7pG8e8`z*=nDexB##2u%x}xB%>p7mE8HrIhpH;+K7nA-F6xUZ}}28AE0& zrC3}Q=X2D}rx-f-#l8+&B!H&LAK?{6!D^jpnjUMdpZ9DlNZ}?;PXnkHZ5mlj0pjsp zyibTuZh&5uxl0+Q6)&|1n*jQRaK5Yl7M&)-6B% zU*;q*V_>%_YC{2#iNSifTg~}?FbrrfZnN0ra@lQc#Cert8ExPl8 z!H1LN)s?1c)%SP>UH6%tvhck~U%b=5i=ud8p@%z@khT#hARKLnq z@@vI5xHu;->x>N0<}{ z@PqIF`oc!rmCTch!wr)RupLHwzwOS`ynZP@->hF1E3E6~Jlb67 zJM@e_6;SwA#EwL`=^^#-^A*}fZ$@tryI9Eh)RF;=M4rv+^5f{PoaR2)SS_d9=l zjXPMZQ#OFMijs7^8W4cI`V1~j00vh%Z-D}kSD(S93Bceg=PghG^6E3VGyxb~<-7$7 xKwf Date: Fri, 22 Sep 2023 15:52:05 +0800 Subject: [PATCH 16/23] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/store/settled/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 987dbb4..52fada0 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -384,7 +384,7 @@ this.num = 15 this.isshow = false } else { - this.num = 0 + this.num = 15 this.isshow = false } }, @@ -839,6 +839,7 @@ if (!value.classification) return that.$util.Tips({ title: '请选择商户分类' }); + if (!this.mer_storeType) return that.$util.Tips({ title: '请选择商户类型' }) @@ -851,6 +852,11 @@ if (that.isShowCode && !that.codeVal) return that.$util.Tips({ title: '请填写图片验证码' }); + if (that.pics.length==0 ) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + + that.validate = true; return true; }, From 062664c629dd954ebaeab2c9b8b32fdc257b220b Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Sat, 23 Sep 2023 15:47:57 +0800 Subject: [PATCH 17/23] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 16 +- api/product.js | 6 + api/store.js | 18 +- components/payment/index.vue | 5 +- pages/moreProject/moreProject.vue | 728 ++++++++++++++++++++++++++++-- pages/store/settled/index.vue | 7 +- pages/users/login/login_copy.vue | 10 +- 7 files changed, 742 insertions(+), 48 deletions(-) diff --git a/api/api.js b/api/api.js index 6877e42..7d9d20c 100644 --- a/api/api.js +++ b/api/api.js @@ -290,4 +290,18 @@ export function village(data) { */ export function brigade(data) { return request.get('v2/system/brigade', data, { noAuth: true }); -} \ No newline at end of file +} + +/* + 生产 -- 获取商户保证金信息支付接口 +*/ +export function paymerchant() { + return request.post(`user/margin`,{}); +} + +/* + 生产 -- 获取商户保证金信息接口 +*/ +export function merchant(data) { + return request.get(`store/merchant/margin`, data); +} diff --git a/api/product.js b/api/product.js index bd8caa4..28dcaf2 100644 --- a/api/product.js +++ b/api/product.js @@ -308,6 +308,12 @@ export function business(data) { noAuth: true }); } +/* + 商品 -- 获取交易申请记录 +*/ +export function intention(data) { + return request.get(`intention/lst`, data); +} /* 商品 -- 同意提交申请 diff --git a/api/store.js b/api/store.js index 2a8ae0f..1e3af0d 100644 --- a/api/store.js +++ b/api/store.js @@ -577,6 +577,20 @@ export function vicinityStoreApi(data) { /* 商家入驻 -- 获取商户入驻申请协议内容 */ -export function agreeiness(data) { +export function agreeiness() { return request.get(`business/agree`, data, { noAuth: true }); -} \ No newline at end of file +} + +//测试 +export function dotest() { + return request.get(`dotest`,{}, { noAuth: true }); +} + +/* + 生产 -- 商户保证金信息接口 +*/ +export function merchant() { + return request.get(`store/merchant/margin`, data, { noAuth: true }); +} + + diff --git a/components/payment/index.vue b/components/payment/index.vue index a27272f..552db8d 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -108,7 +108,6 @@ type = 'alipayQr'; // #endif } else if (paytype == 'creditBuy') { - console.log('123123'); type = 'creditBuy' } if (!that.order_id) return that.$util.Tips({ @@ -371,6 +370,10 @@ break; // #endif } + + + + }).catch(err => { uni.hideLoading(); return that.$util.Tips({ diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index d4fc247..c75b9c2 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -5,6 +5,19 @@ 市级供应链 + + + + + + + + + + 交易申请状态：已通过 + 交易申请状态：已拒绝 + 交易申请状态：待审核 + @@ -54,7 +67,12 @@ 订单核销 - + + + 保证缴纳金 + + @@ -151,7 +183,12 @@ 商户设置 - + + + + 保证缴纳金 + + + 保证缴纳金 + @@ -367,7 +438,96 @@ + + + + + +
+ + 填写信息 + + + + 开户行名称: + + + + + + + + 联系电话: + + + + + + + 开户行: + + + + + + 身份证正面: + + + + + + + + + + + + + + + + + + + + + 银行卡反面: + + + + + + + + + + + + + + + + + + + + + + +
+ + @@ -381,6 +541,7 @@ } from 'vuex' import { business, + intention, intentionbus } from "@/api/product" import { @@ -396,7 +557,9 @@ Toast } from '@/libs/uniApi'; import { - getDiy + getDiy, + merchant, + paymerchant } from '@/api/api.js' export default { @@ -425,7 +588,23 @@ tagStyle: { img: 'width:100%;display:block;' }, - num: 15 + num: 15, + where: { + type: 2, + page: 1, + limit: 10 + }, + codenote: [], + validate: false, + merchantData: { + bank_username: '', + bank_opening: '', + bank_front: '', + bank_back: '', + cardno_front: '', + cardno_back: '' + }, + }; }, computed: { @@ -443,31 +622,129 @@ } this.getUserInfo() this.list() + this.codelist() + + }, methods: { + //关闭弹窗 + close() { + this.$refs.popup.close() + this.num = 15 + }, + //获取交易信息 + codelist() { + intention(this.where).then(res => { + this.codenote = res.data.list + }) + }, + + decimal() { + merchant({ + id: this.mer_id + }).then((res) => { + this.merchant_Data = res.data + }); + }, + //缴纳保证金 + paydecimal() { + if (this.merchant_Data.is_margin == 2) { + that.$util.Tips({ + title: '用户已提交' + }); + } else { + + + uni.showModal({ + title: '提示', + content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金', + success: function(res) { + if (res.confirm) { + // console.log('用户点击确定'); + paymerchant().then((res) => { + console.log(res.data) + uni.requestPayment({ + provider: 'wxpay', + orderInfo: res.data + .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 + success: function(res) { + console.log('success:' + JSON.stringify(res)); + }, + fail: function(err) { + console.log('fail:' + JSON.stringify(err)); + } + }); + }).catch((err) => { + console.log(err) + }) + } else if (res.cancel) { + console.log('用户点击取消'); + } + } + }); + + } + + }, + //提交 + formSubmit: function(e) { + let that = this; + if (that.validateForm() && that.validate) { + + that.validate = false; + + intentionbus(that.merchantData).then(res => { + if (res.status == 200) { + this.$refs.popup.close() + that.$util.Tips({ + title: '提交成功' + }); + this.codelist() + that.timer = setTimeout(() => { + that.successful = true; + that.validate = true; + }, 1000) + + } + }).catch(res => { + that.validate = true; + this.num = 15 + this.$refs.popup.close() + that.$util.Tips({ + title: res + }); + }) + + + } + + }, //同意 agree() { - intentionbus({ - "status": 1 - }).then((res) => { - if (res.status == 200) { - this.$util.Tips({ - title: res.message, - icon: 'success', - }) - this.getUserInfo() - this.isFshow = false - } - }).catch((err) => { - this.isFshow = false - this.$util.Tips({ - title: err, - icon: 'error', - }) - }) + this.$refs.popup.open() + this.isFshow = false + + // intentionbus({ + // "status": 1 + // }).then((res) => { + // if (res.status == 200) { + // this.$util.Tips({ + // title: res.message, + // icon: 'success', + // }) + // this.getUserInfo() + // this.isFshow = false + // } + // }).catch((err) => { + // this.isFshow = false + // this.$util.Tips({ + // title: err, + // icon: 'error', + // }) + // }) }, //拒绝 refuse() { @@ -482,7 +759,7 @@ this.num = 15 this.isFshow = false } else { - this.num = 0 + this.num = 15 this.isFshow = false } }, @@ -509,6 +786,106 @@ }, 1000); + }, + //验证 + validateBtn: function() { + let that = this, + value = that.merchantData; + if (value.bank_username && value.bank_opening) { + if (!that.isShowCode) { + that.validate = true; + } else { + if (that.codeVal) { + that.validate = true; + } else { + that.validate = false; + } + } + } else { + that.validate = false; + } + }, + validateForm: function() { + let that = this, + value = that.merchantData; + + if (!value.bank_username) return that.$util.Tips({ + title: '请输入银行账户姓名' + }); + if (!value.bank_opening) return that.$util.Tips({ + title: '请输入开户行' + }); + + if (value.bank_front.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + + if (value.bank_back.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + if (value.cardno_front.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + if (value.cardno_back.length == 0) return that.$util.Tips({ + title: '请上传一张或者多张图片' + }); + that.validate = true; + return true; + }, + /** + * 上传文件 + * + */ + uploadpic(data) { + let that = this; + if (data.type == 1) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.cardno_front = res.data.path + + }); + } else if (data.type == 2) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.cardno_back = res.data.path + + }); + } else if (data.type == 3) { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.bank_front = res.data.path + + }); + } else { + that.$util.uploadImageOne('upload/image', function(res) { + that.merchantData.bank_back = res.data.path + + }); + } + + }, + //删除图片 + DelPic(data) { + let that = this; + if (data.type == 1) { + + that.merchantData.cardno_front = '' + + + } else if (data.type == 2) { + + that.merchantData.cardno_back = '' + + + } else if (data.type == 3) { + + that.merchantData.bank_front = '' + + + } else { + + that.merchantData.bank_back = '' + + + } + }, //商户设置 buyserset() { @@ -524,10 +901,10 @@ this.detail = res.data }) }, + navigator(url, t) { - // uni.navigateTo({ - // url: url - // }) + + if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { this.isFshow = true this.countDown() @@ -536,19 +913,20 @@ url: url }) } - }, getUserInfo: function() { let that = this; getUserInfo().then(res => { that.userInfoData = res.data; - // console.log(res.data.service); + this.merchantData.phone = res.data.phone + if (res.data.service == null) { // console.log('123'); this.isShow = false } else { this.isShow = true this.mer_id = res.data.service.mer_id + this.decimal() } if (!res.data.mer_info) { @@ -566,6 +944,241 @@ background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); } + .userpage { + width: 100%; + height: 1368rpx; + padding-top: 150rpx; + background-color: #fff; + position: relative; + } + + .userpage-icon { + width: 60rpx; + height: 60rpx; + position: absolute; + top: 60rpx; + right: 60rpx; + + image { + width: 100%; + height: 100%; + } + } + + .item-name { + width: 190rpx; + } + + .merchantsSettled { + height: 1368rpx; + } + + .merchantsSettled .title { + font-size: 35rpx; + font-family: Microsoft YaHei; + font-weight: 400; + text-align: center; + } + + .merchantsSettled .list { + background-color: #fff; + border-radius: 12px; + + margin: 0 15px; + position: absolute; + + width: calc(100% - 30px); + + } + + .application-record { + position: absolute; + display: flex; + align-items: center; + top: 240rpx; + right: 0; + color: #fff; + font-size: 22rpx; + background-color: rgba(0, 0, 0, 0.3); + padding: 8rpx 18rpx; + border-radius: 20px 0px 0px 20px; + } + + .item-card { + display: flex; + margin-top: 20rpx; + + .item-carda { + width: 298rpx; + height: 175rpx; + margin-right: 20rpx; + + image { + width: 100%; + height: 100%; + } + } + + .item-cardb { + width: 298rpx; + height: 175rpx; + + image { + width: 100%; + height: 100%; + } + } + } + + .merchantsSettled .list .item { + padding: 50rpx 0 20rpx; + + position: relative; + margin: 0 20px; + + &.no-border { + border-bottom: none; + padding-left: 0; + padding-right: 0; + } + + .item-title { + color: #666666; + font-size: 28rpx; + display: block; + } + + .item-desc { + color: #B2B2B2; + font-size: 22rpx; + display: block; + margin-top: 9rpx; + line-height: 36rpx; + } + } + + .acea-row, + .upload { + display: -webkit-box; + display: -moz-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-lines: multiple; + -moz-box-lines: multiple; + -o-box-lines: multiple; + -webkit-flex-wrap: wrap; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + } + + .upload { + margin-top: 20rpx; + } + + .acea-row.row-middle { + -webkit-box-align: center; + -moz-box-align: center; + -o-box-align: center; + -ms-flex-align: center; + -webkit-align-items: center; + align-items: center; + padding-left: 2px; + } + + .acea-row.row-column { + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + -o-box-orient: vertical; + -webkit-flex-direction: column; + -ms-flex-direction: column; + flex-direction: column; + } + + .acea-row.row-center-wrapper { + -webkit-box-align: center; + -moz-box-align: center; + -o-box-align: center; + -ms-flex-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-box-pack: center; + -moz-box-pack: center; + -o-box-pack: center; + -ms-flex-pack: center; + -webkit-justify-content: center; + justify-content: center; + } + + .merchantsSettled .list .item .pictrue { + width: 130rpx; + height: 130rpx; + margin: 24rpx 22rpx 0 0; + position: relative; + font-size: 11px; + color: #bbb; + + &:nth-child(4n) { + margin-right: 0; + } + + &:nth-last-child(1) { + border: 0.5px solid #ddd; + box-sizing: border-box; + } + + uni-image, + image { + width: 100%; + height: 100%; + border-radius: 1px; + + img { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + display: block; + position: absolute; + top: 0; + left: 0; + opacity: 0; + width: 100%; + height: 100%; + } + } + + .icon-guanbi1 { + font-size: 33rpx; + position: absolute; + top: -10px; + right: -10px; + } + } + + .uni-list-cell-db { + position: relative; + } + + .merchantsSettled .submitBtn { + width: 588rpx; + margin: 0 auto; + height: 86rpx; + border-radius: 25px; + text-align: center; + line-height: 86rpx; + font-size: 15px; + color: #fff; + background: #E3E3E3; + margin-top: 25px; + pointer-events: none; + } + + .merchantsSettled .submitBtn.on { + background: red; + pointer-events: all; + } + + .settlementAgreement { width: 100%; height: 100%; @@ -783,7 +1396,48 @@ // margin-top: 52.63rpx; padding-top: 32rpx; border-radius: 17.54rpx; + // box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16); + .special_work-title { + display: flex; + margin-bottom: 50rpx; + + background-color: #efefef; + padding: 10rpx 10rpx; + + .special_work-titlea { + width: 40rpx; + height: 40rpx; + + image { + width: 100%; + height: 100%; + } + } + + .special_work-titleb { + font-size: 23rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #737373; + margin-top: 5rpx; + } + + .special_work-titlec { + font-size: 23rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #16C295; + margin-top: 5rpx; + } + + .special_work-titled { + font-size: 23rpx; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + margin-top: 5rpx; + } + } .title { font-size: 31.58rpx; diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 52fada0..150d84a 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -489,6 +489,8 @@ that.isType = true getAgreementApi('sys_merchant_type').then(res => { that.protocol = res.data.sys_merchant_type + + }) }, // 获取历史提交数据详情 @@ -637,7 +639,7 @@ */ DelPic: function(index) { let that = this, - pic = this.pics[index]; + pic = this.pics[index]; that.pics.splice(index, 1); that.$set(that, 'pics', that.pics); }, @@ -723,8 +725,9 @@ }, formSubmit: function(e) { + console.log(this.mer_storeType) - if (this.num == 0) { + if (this.num == 0||this.mer_storeType=='镇级供应链') { let that = this; if (that.validateForm() && that.validate) { diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue index 159220f..6603d0e 100644 --- a/pages/users/login/login_copy.vue +++ b/pages/users/login/login_copy.vue @@ -14,7 +14,7 @@ {{ item }} -
+
@@ -39,7 +39,7 @@
-
+
@@ -70,8 +70,8 @@
-
登录
-
登录
+
登录
+
登录
@@ -260,7 +260,7 @@ }, data: function() { return { - navList: ["账号登录", "快速登录"], + navList: ["快速登录","账号登录"], current: 0, account: "", password: "", From 5b0b4b570e119a57296e3ae239ed344e96071920 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Sat, 23 Sep 2023 15:50:18 +0800 Subject: [PATCH 18/23] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/images/SFFF.png | Bin 0 -> 1977 bytes static/images/SFZZ.png | Bin 0 -> 1841 bytes static/images/YHKF.png | Bin 0 -> 1913 bytes static/images/YHKZ.png | Bin 0 -> 1795 bytes static/images/de1.png | Bin 0 -> 938 bytes static/images/de2.png | Bin 0 -> 997 bytes static/images/de3.png | Bin 0 -> 956 bytes static/images/ti1.png | Bin 0 -> 6120 bytes 8 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 static/images/SFFF.png create mode 100644 static/images/SFZZ.png create mode 100644 static/images/YHKF.png create mode 100644 static/images/YHKZ.png create mode 100644 static/images/de1.png create mode 100644 static/images/de2.png create mode 100644 static/images/de3.png create mode 100644 static/images/ti1.png diff --git a/static/images/SFFF.png b/static/images/SFFF.png new file mode 100644 index 0000000000000000000000000000000000000000..def3aaa8a923a666bb3b52efe9bcf58a6c7d1dc1 GIT binary patch literal 1977 zcmaJ?S6Gt?7X2etkU$U+LWvSW6%m|Jg#i+fgwV6NVt_~y482N~sC0A?A{bFRLIgx= z5HKX*;!rJs^b$wJNNCbwfEjl8VITJUd^q<$ocnO^`Of`Ln!W8M5h17$001HwE41TL zuRMa6ApcR7dRS!%00LwT+6*7{bSd98RrVj!$+I~n9_rL#0=^h=)n4NcCs3`c67S5% zg^{E-Y9t~jGu(!sNIXxS$S6Op$f#}8V?cyl7npbGjaJshuQXD-oS(^7J125BO5`(y z>qF<`8ZgR~emlLk-TD=t@5&T|Z#cvEPgjh5lqv1wdU|HBAS_)#i|3UnD^#q0mB1G) z#X18B0R2?We=0u-Q6awv?St7!U=|B9mx2zN)$pvUlQn??{^0NY-!b>gV4x^|)^RLW zDy!;`qL3egWG!II3oVa)dn_s=HYHpp79jAR_dv()?5)FDksRoww(flx1^q4^|oXyg)cNqc(x;ti9;!AjUAp!_?smQNZ>peDw8~Kw?6d zN&mVp9XqXbEFGF@ET1RyozjZol|ZJGzTN_4jmA1HZ`^IXU1GUzp4nIoO^4cKw+uF3 ztQRb_mb{n*9WXBTn`*C&9uLrvEqqV#bNlu(<62V}G+NVJmGp~-`DhgU4;*Lf?&rRn z5}mop&1UmNj*2=l6MDZzh~z!w@@GN7IjXye|9DU#Yzl-=uo>jP!DDfMK8{9X9(*9I zG9OQ@|C#_g+))dZt-DO9Jil=%tp3u3y~xqb8$RDJ-N*j3ltufhG1*Dp|MSB}vx%eo z>Lv-^Gq+=W7*&TDrG0fQp)yB1Olvo~CPHqv)AyThs}K9KgLv&p*5l~vm3#lyBwK5r zhq!*RC+2Nc-^jmJqCC)|rbVwirFg1^ja*UtlR9kSVeUZ5)*_(VYi$yZ^NTiaK*D8X z2j^D%@h*$o>oD^skD8hoFpC0=@CTZPfLWIT6SMYUx7n0M1^opTD4SNu`G1f6)IdKa z&4N-F48ep7rZ7D*T<}1zC^-KN@F=Utrb5+k&P0eP_IT>6X+FX$H1pEK=?q+;{wBS7 zmM%{ApB8VhDIY+JOtzvws8w<$Kyu)-!ZX6X-Ljicc2G0S!{2VohqYggn-@xfEG1_RDZQRoXlhE0 z{3d_j;dio%od|q_rc%Mh^>Bk7G)oJVu1^<{w}{Y;klLLSDe2Nl#t-sV!aYUh!mEFG zC+6-EEA>?>MVf{p>KE5KnK>qM8W;nyl2fqJ9&DrFRxjz}ROxk8XT0&!n>_A4tCx%0 zRJdXVf?~u!D)VR(4W?JCP$oaEF}&oGxoAn>9K(mN<60i~NJW%$8K)ov#+6ysS{om2 ztD*2Powj!~ra`2hIZH+ap~B$)`RHc`_KR?hK5W<-J%cyduuS?6ZU}Ot8_#a|HrG@b zbE20U84<3TXE896Hn>BB5vU-?;Dz4#%!9Q!t1=PhqxN6dniLs+ON1HF!*Y&tIKr7ZEeO{ z7kksAOq|5o?7(Bz>e%3dY&F#sk0Mdu!X`yg(yx%K+|LHrSA(+lsD!gX)`dWjh?xrAJ`|LU^1+i&$0r23g7~-gn zrAyk!^KX>jOBcVz_0DL$Riv9h@(~<7FQH=vrO*$aB5i`Eor>L?Y0e+CgHC%@`0zUo zh)%=>D|PWkkMu8$?TNWt zXC@TTOQFkbGqK+ofTjHYu0jduFi!O2Pk-+=B!ZvyV#>A5`U;p`3E6A|$8D!P*!7Sn zH&_m%fXFpwPPp3J0hC_1MQatXIA5UXnj8|^6f&H;r$rtB+;~@I$TssOI?LMiR$l+= zumip3WvhLmB^WOt04~U1pjMRS(uL`){jD;<_ I#+-QPZy(p1X8-^I literal 0 HcmV?d00001 diff --git a/static/images/SFZZ.png b/static/images/SFZZ.png new file mode 100644 index 0000000000000000000000000000000000000000..1b153024ff66c91354c2ee403b7984fc38ee724f GIT binary patch literal 1841 zcmah~X*3&%8ueoBnswX_ryOJ2{M_hZg`=e+mhyZ6UE-=BN#{XU|TgO!MotPl?mkBE&m z!ucCld>cPOfo~{9sitv>qDn zm|#*RqdH}TjmnD^Ica4H;Dq~7_B&dHp;?h*%$xxm@$O766D1Ls8nOGu|Ke8|PFCwG{1lS|Fk@FM@kb+oL^ z6u|c}Kq*MJiG7E*j~?*B{bn8sFDi{#jbHMSB~lz-)Q@?!`UCer0w`wot3_S9Lx#0+ zQ+WX}yeZf5$gqQ(3(&kad{0pkMW4!Q=~-0Oc_r4K)qeb|?bz6oQI|pmC;8mVU9&j&3I4E!=1aei=?Z$$*ND@)IdT6U3s^JquhXcO_?zyAM3(*pC}ssck`_ zn1w@7-Yi0(QjlR-6&zGs3kQ{EQUgiqg}ek8ZG!owzxLB-x72pgDQ)66zrvhHt5w{~ z(Pgs@ORhh%&oB3Pu|xJ~FFjG=JK`8W{zc%qzf5uI&+bS7sw-_|{@b%%r<#_8n1gEs zx^c6+wAu8Axkly%A|)q$8QhxaDj^0T0@JP3bs~^K;M_uXsrh&_EaL!& z&&<}3Kx3k#RB$m0*4!P;IJjedKVZH8hpB*biD7ZvY8h00H_jeH#!7J9#hm@CnQYC ztv@G89nA2M!RvH)1b*k2oRk;y)-ROv?@DIor*m!`=4(_0C}ee2&uFpS_I_$?d{(k+ zGGGa{t0eWUuSyg~(ls_0XYP>F=kjDd0nF^QnjbVtlm$aL}$adMEXaHK;1K1t~G6FhpD_9x!*rm>; zPU)Qcqh-uQwR?yxImSmuUWZPVcDd@;lfU;SwW9D47s^AS65`#0*H5x5DYL`{@9w(b zaNt$9i268K^6+43xAo!g)vENjZc_C{@1M`pV8!#r++ZaV&olJ7y%HT}HOXWffR@`KDcWPH+Q z1NVEC9-Yen(KiBm{ML1~Q=EYbrUvM7O0vuXA+aW-K}H|N-StZyUW$Ao6vj4mwbwTz z(x1viZ`)ny(VRhoC-(Q4_&mmzh{8bkxpLLI zBvaM>=9{>Y>1eOHCoeqpsN20^(5qEQMyyTf5oC}q);rc)dFt?p3#l8=Q~P;{aVozy zN8Yx)y?f+d$z3_m91>r3LuQ*w4my?0zg6VIJ|2Qjh{M4#D^~`C|I8GLSX;#<@$c;# zcMAOXZT(wG92haI^FXc9vV2jw2SxuZ#o-a)2xSa|_{&+WwUzCj>d>GuH2HD*FmLpR zHPPgQLCpII29X1+<82YfO1BK%j4xG$j1$c;J3v+_%YXIm?n8!md^L@i){x8;-ARnuOTj1KULlW-g#)6->{jBx0EcUO;{X5v literal 0 HcmV?d00001 diff --git a/static/images/YHKF.png b/static/images/YHKF.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ba19ecec0d9d5c5ef90ec63dfccd8f5703c05d GIT binary patch literal 1913 zcmaJ?dooG{JnDT3k&kyhyFf5xkmbZO)fS$x2i!tWHHbw>jusl$7^DpN#FM;Km)p zx@QvEY|dTF85VmmK1gKe9cRmqAF~$jvW2#vuh|BLERT-vj}UKBVvYdI&=$GWwF(VD z4M0dz)S1laQU11bBcAOfauVyN@2v1#BP!)1yZd zNoa(r;X&w%B(;>zxG>-iT>d52`F9IIAWPLkPj~^{{i;ZrDZ(TJzJ3@$Jyyi%4U9r} z5bIWcG@ZhQq#PILk5vp%Qn`phtyWZV!&i%Ey5Q~IX|j6y?qaB;`j!6`zayKRxD_=Q z0gOSeiZc^|bIv~}LpI?|4q%Jc{nqw&><+*>U<| z6;$G?(k$b4B9GsWaCj2qZFoCF|2T>JlHXY;r?@XuGd=1!Oi<|G^U~GGRA-?gzttJk zyM!OE^%J`;6L10Q!kaB3kLbWF886}$m^bB%I~<1p#oSvU^-EP)e!K#OK@zbhDUY#S z9f?d$I)qT7p^@K;kybvH9W^Hgly?4>cBU0JE}p5$-Un%gy>gqNd}I|p9;r#(^lua# zo}etl{6FS+(jUF=Y5nroB7K0o+o_26y`RS+-mJdahNRHU9dlBbtrWMnmcyPm_3;h~ zTNaM#2Y|4_GRgMVz=j)RW)JW9z{0Fa+S*)LVKTk#-_vUC-IKpnMgAcQGRPHeOKwiq zGk6)@0%95=*&YDTe^GfwE%c(PyRw&@B?nqsp%TJ-c`3nfh$uxYzrM~tkEsu2KtXWM_ zyBc$~(Tf$#7V~Zsw5n9&@SGt`4Xi(wWuUam4xxuVyr9XIIUbrWZL3SnHuqW8JUh3% z)04E4WAiSIHU2^cViDY zL&9@po#H=|co^%C<~M5J>S=-DrqSh*c{Ul92$eHOh-oRG1ZgE+gkUfTkUjBQD?|!2 zF>9$mjXF>q(GqD-oVpWc^|qtIv3@+QY}@GSYH2vf4L&CYKvfub_g zcNrURwBNsd*mmei{RcwM@PlUyBN`j8&GUY3TOYxeXCf02hF+t#*;wBc$xqMM3B8wo zonk1hPI=8RUJ>SozTSKDi||3gna+`j+zgycs)AiY(83(fggX`@e4&Kwg2x`JyQBJh zfY!oB7xqA!t8+{^LhtTZ7Je&AE!6n%4Nav$9Ls4i;3fpwWi7?1d3VdCU z`a{^ke7EdUr`ylCj!nQ~Fg7nWu*^RkajJTEUw{EsP3*c{84U?{!`Fu(Bww3(tKHfuG*b}PKSNChw`SMZ@@K+50T CNPyP> literal 0 HcmV?d00001 diff --git a/static/images/YHKZ.png b/static/images/YHKZ.png new file mode 100644 index 0000000000000000000000000000000000000000..f259cbfa973b64a4f963b7601f160f19988307d7 GIT binary patch literal 1795 zcmbuAdpr}00>|ggmK+L6AFk@iEAyHV(;Q(IjpPxV_oJCdY?kMYk5f7{2a8;fIma|Y zle&bqQ5H%ytA;9Ebr^w`~SUv+&_N5@9*E=Kfhl-($iHLcoGNz0F>cw&fbS? zJXD0D{Gn@WvM{2>iMyCTpo8%_6 zDIom09Iz(({ag1FUa2!c)tSpJ7X-4srkiM_sk=eWGi~SJe1%1kve)MFJULES`{e40 zsw&&IrOI1^{VtY@$?*Lp`=v?;R;pn5;lt{|cHSIc7OQ}k(gA4bak9p<+t{kYznRT! zhSW|Mc4dRJr%B@^@hY~xW7(137CDanGO9z*97G)i=2UQ~7Xt^z0M>dR@s#&Rn4p3?sS1NmrKej!-`00XW{OJookB%;hxc0%^mfe4~?dI5_4G8)6#yEuLD zL;gZCSw;*X_XmAD`&s_sN;?X7-1kc3@>QdnuDpyjDzVFXs%W;%!Ry92MK9lg4xdlH zDeNHbc%ErSl7l53U__WVa&BlTUXCfvv#x#ioc1)w;zxNo2vb6Wc$g#fM&#Gv|*YM5s`PGue80jtUF;Hs_LvuUdqL=@2YJZ~TtdJXyec_q~B+q=fK z7mwa?WLau&V!vBQ+^fhkhe0q_1Whidg0|`C*A*6Ji-rDR5A8m-&eEUw`JYa(!W2C# zI&06rYnFKI9r<8aZvVUCnspf1Cb(gloRV}O`^riVGU*!kzW-0_e`k079ht<&yg-|U zcD=U4dJ}VN774HyCA6;nABzR|)cl|q=Aj7YAWi3V37^+lRc*Q9TPm9(651dqvlamt%*9MmBE1LtsV-Qe6#U?I9aWz)h(1@sUz16< z>zRC%d8z%ezK5q@{Ymw1#{<=MTLNM1EBhLIs8NM#qmrSV;jW+FBY>r-6mIuPA4*>C z`V}OyPxk)@LyH?0njIEO2W>h}zQzJ`+Cj#dh6>~uD6aN zD&yS4HlcN!M0kwbsVLyQ@YH-mR4&gx+r^67%AhH1R0mxz)X_QZ;TcJ<$Nt7)c%&^UMMt8YOt-aSf!C7G-~g)FmM zwll!}%RVS%v?#2{AibdEs_1&tV$8ELYJEIZ2ZTd@ER8my%vndu15)wfQ+8%=b8%zv!+r){7&Gjec}#c+Cpu^;msa5>%eP%Y+=Q?S&ZQ>jPXHQ~AVcPReG z-=mtzb{`MEQ!=?j^*Ef!I3;I`r>85xH0!96w@;$|Mk*rWQJ=snO*xC}vQz(&E5f{;Y@op$_i!=&mq{tf9vd672jw+gapxd= zsIWX1&cC|)#>!70KGnn$%z9rmFsM6T2|r&7W7vtrUtxH?j*q%3TiNl(D0N`PRQSHc zrD99nLmT^oi7yu!woDp66%=_n;#)Gl`8EeTh;-ZRK_L+OnXH_PC!{n%bIgXC>RkdP zAhDRQBqHM*tUBPdBmj4E`O%{1t-NUja@D0J8(+j^x|)oROYSQFxA`=sA7jVap*S=R zsqr8r>&fk(%H7%nlq>Nt2k8~g@~@@~Pg5gEtiTv8hHJEYXTh8Kq%to}E|FBoMzELI zX#|;y;c}eYQ1oX@VWjY8*`Mos^fD5JeKf?8;T=jjYAC%#QX#3h=Vl6tJfqKIYB%t& Py92;4dpfr`h2;DTe>rFb literal 0 HcmV?d00001 diff --git a/static/images/de1.png b/static/images/de1.png new file mode 100644 index 0000000000000000000000000000000000000000..13d1db34bec0a249d283f1249becaabca13a8657 GIT binary patch literal 938 zcmV;b16BNqP)Px&WJyFpR9Hvtm`_L)aTLejo1I`6IxKeaP+({z;la$HphF#mgbsD;x`7g@xwA7# z1qF#71o^#P^AANHgig|-AVLpG8yHBWThyV0P>@g%of39gc6jlV*<~7McAd4I_TU_6 z-u&KYzVH3s@4Z2&^9$>o5B30e8=*Y~%PD9W#t8tp!OUqQdgx~RPZjL%?>{g-J^iav zSo`|=8pGl62qMM+Km~w;5Mp1=0Hwo7B(eYi?acfc00xL?$qUpljBfyN(Dr;*2+>;; zKnv~_0JIhzF!LreA5SKe>rSV!SS;Mo(C{4*qX6*UG|faRl}dYk%&tQ0gk$D)L~OB~ zjR_%cyE#rI5-o_>y0*5qm`w5r(Lh;PUoXSfz4Bn?L|HO>0sVLca zc`9hts;jaT*g6+C-ffV9bTdT~IX^_B(MCI&Y}FC*iLKN53o=kZuMiIo4xUj}Rh|aL zcB}+h7l0Dn3vwrbLqkK&g+ie%lgYfO+0f($$;?xTIAGPiDI&V=jDmCQR1{@ke0=yqeL|9rHVCpjQ~I}zdkI;HdR$S znR(gmkAiEB(zNzaD0DNhpGP}68T{JpItTqa^lQHd=vOhPecdbg2P$g>N2I|h#Q*>R M07*qoM6N<$g1RQ8(*OVf literal 0 HcmV?d00001 diff --git a/static/images/de2.png b/static/images/de2.png new file mode 100644 index 0000000000000000000000000000000000000000..a899cdd2ca81ded2389bb943ea6f8e24e7195d3b GIT binary patch literal 997 zcmVPx&pGibPR9Hvtm_cY9RT#(r|Cvqcq2h`=p$COZD+cKy(iRo66ZcTC;6YDbTWArT zNmLNDP$9(}aL{>-hI|x+bpb>@9l*tA3$)NWI;q4YT6we7+~zsz!egcBJ#5)+%?<1mIZ3vsQyOs zv1D8zpDNouH4wliocJUsS`G#Gpz(~VILjNH`g6N2v-CT`q6lt_)^7)und@1L*;a_V z;Y6@Z;y~m~hy_)4PNzAxeD8ojCISRkQJHJ>N{PM!H^2dPgg8bMcVj@{Gi5s`Hp|D& z#`^-yf>Rae-gwQE{}r$oTm&{Wz*2qbDQZ1O;dAX_5J-_^ab2Z2tdVlboS^^~{SWtz z8M}TYu_r4>WIgBF;SvR#F_vYaaWb&qxUpHD<=!M#t@;VUlTAPP4rEKArZM>mAx?M0 zwF4%}Eh6)3+I_!Y$ka_@)s}ohUJ%HNvfan?7>`06D+siXNWG=V)3{MFFmlXoh!D|u|SFS6smM8WL)vE0rjR9-k6#_4IRtH>FwsUN_ zfVOiYEgDwcdzBgs9e@VjQ&Y~xp#zTByk7w9i>iT|c8-ix4*nBjahHkjBPb1g6xhz| zqXc*nBKt`mj-VQ0`23y9?5&Xi6cLaQ_MZkm4{Ya^yl|OiX1wNI2Jmup6o-K`(D zxF%MzPRz|hEnrfn1-C@wXj<3V3UF$fDf!ix43l5I7QT70zKAMn= z2McE5@cj_=Khs_mQfQ05H#ug?yF+_C+Dd20J7?QDnAc(6`8$Al73-cq@(TV7sGS8z Twrpk*00000NkvXXu0mjfY!=c5 literal 0 HcmV?d00001 diff --git a/static/images/de3.png b/static/images/de3.png new file mode 100644 index 0000000000000000000000000000000000000000..aff2a38cccfcea49723f40816eb9978a74f03a96 GIT binary patch literal 956 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 Date: Sat, 23 Sep 2023 20:55:14 +0800 Subject: [PATCH 19/23] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E5=85=A5=E9=A9=BB=E4=BB=A5=E5=8F=8A=E7=94=9F=E4=BA=A7=E5=8D=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + api/store.js | 13 +---- api/user.js | 9 ++++ pages/moreProject/moreProject.vue | 32 +++++------- pages/store/settled/index.vue | 82 +++++++++++++++++-------------- pages/user/index.vue | 4 ++ 6 files changed, 71 insertions(+), 70 deletions(-) diff --git a/App.vue b/App.vue index e273265..d56d2d7 100644 --- a/App.vue +++ b/App.vue @@ -164,6 +164,7 @@ // console.log("jpush连接", connectEnable) }) + // 设置别名 // jpushModule.setAlias({ // 'alias': uni.getStorageSync('userId'), diff --git a/api/store.js b/api/store.js index 1e3af0d..3659801 100644 --- a/api/store.js +++ b/api/store.js @@ -577,20 +577,9 @@ export function vicinityStoreApi(data) { /* 商家入驻 -- 获取商户入驻申请协议内容 */ -export function agreeiness() { +export function agreeiness(data) { return request.get(`business/agree`, data, { noAuth: true }); } -//测试 -export function dotest() { - return request.get(`dotest`,{}, { noAuth: true }); -} - -/* - 生产 -- 商户保证金信息接口 -*/ -export function merchant() { - return request.get(`store/merchant/margin`, data, { noAuth: true }); -} diff --git a/api/user.js b/api/user.js index 0009c40..4594d26 100644 --- a/api/user.js +++ b/api/user.js @@ -8,6 +8,8 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- import request from "@/utils/request.js"; + +import request1 from "@/utils/requestb.js"; import Cache from '@/utils/cache' /** * 获取版本信息 @@ -721,3 +723,10 @@ export function getBillDetil() { return request.get(`mer/financial_record`) } + + +//获取商户入驻所签署公司 + +export function merstreet(data) { + return request1.get(`company/street_company`, data); +} diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index c75b9c2..810b95d 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -383,8 +383,6 @@ - - @@ -416,7 +414,7 @@ - +
{{detail.title}}
@@ -651,9 +649,9 @@ }, //缴纳保证金 paydecimal() { - if (this.merchant_Data.is_margin == 2) { - that.$util.Tips({ - title: '用户已提交' + if (this.merchant_Data.is_margin != 1) { + this.$util.Tips({ + title: '暂时无需缴纳保证金' }); } else { @@ -669,7 +667,7 @@ uni.requestPayment({ provider: 'wxpay', orderInfo: res.data - .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 + .config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】 success: function(res) { console.log('success:' + JSON.stringify(res)); }, @@ -903,8 +901,6 @@ }, navigator(url, t) { - - if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) { this.isFshow = true this.countDown() @@ -1196,7 +1192,7 @@ position: absolute; top: 50%; left: 50%; - border-radius: 12rpx; + -webkit-border-radius: 12rpx; padding: 52rpx; -webkit-transform: translate(-50%, -50%); @@ -1241,7 +1237,7 @@ line-height: 22px; text-align: justify; text-justify: distribute-all-lines; - height: 756rpx; + height: 1050rpx; overflow-y: scroll; } @@ -1254,12 +1250,7 @@ text-align: justify; text-justify: distribute-all-lines; - /*#ifdef H5*/ - height: 600rpx; - /*#endif*/ - /*#ifdef APP-PLUS*/ - height: 530rpx; - /*#endif*/ + height: 1050rpx; overflow-y: scroll; @@ -1272,7 +1263,7 @@ .setAgCountbtna { margin-top: 40rpx; - width: 150rpx; + width: 200rpx; height: 74rpx; text-align: center; line-height: 74rpx; @@ -1290,13 +1281,12 @@ margin-top: 40rpx; padding-left: 20rpx; padding-right: 20rpx; - height: 74rpx; + text-align: center; line-height: 74rpx; background: #cecece; border-radius: 46rpx 46rpx; opacity: 1; - font-size: 25rpx; font-family: PingFang SC-Medium, PingFang SC; font-weight: 500; @@ -1306,7 +1296,7 @@ .setAgCountbtnc { margin-top: 40rpx; - width: 150rpx; + width: 200rpx; height: 74rpx; text-align: center; line-height: 74rpx; diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 150d84a..38fa10e 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -126,8 +126,8 @@ 法人名称 - + @@ -192,10 +192,11 @@ - + + 所属公司:{{company?company:"暂无公司信息"}}
{{detail.title}}
- + @@ -205,8 +206,7 @@ 拒绝 - -