From 0811a659f082c41a9f30026f1e0fed64f9996f82 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Wed, 13 Sep 2023 19:47:55 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=A4=9A=E8=A7=84=E6=A0=BC=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/goods_details/index.vue | 4970 ++++++++++++------------ pages/nongKe/cloud_entrepot/index.vue | 215 +- pages/short_video/appSwiper/index.nvue | 12 +- 3 files changed, 2673 insertions(+), 2524 deletions(-) diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index b194bc8..153c189 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -1,2466 +1,2528 @@ \ No newline at end of file diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index bf60242..851c7e4 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -265,19 +265,19 @@ - - fsdfsdfsdfffffffff + {{skuform.store_info}} - 79.00 + ￥ {{skuform.price}} - - 库存:999 + + 库存:{{skuform.sku[this.skusize].stock}} @@ -285,11 +285,14 @@ - + 尺码 - 大号 + {{item.sku}} + + @@ -300,9 +303,9 @@ - + - 加入购物车 + 确定 @@ -361,7 +364,12 @@ data() { let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13'; return { - skuNumber: 0, + skuform: { + + + }, + skusize: 0, + skuNumber: 1, showcartpop: false, trnList: [], act_cart: false, @@ -425,7 +433,7 @@ // console.log(this.appInfo, "手机信息") }, onShow() { - // this.cartFn() + this.cartFn() }, // 分页 onReachBottom() { @@ -514,8 +522,41 @@ // }, methods: { + skusizechange(i) { + + this.skusize = i + }, + skuaddcart() { + this.showcartpop = false + // this.skuform = {} + let res = postCartAdd({ + cart_num: this.skuNumber, + is_new: 0, + product_attr_unique: this.skuform.sku[this.skusize].unique, + product_id: this.skuform.product_id, + product_type: this.skuform.product_type, + spread_id: "", + }).then((res, err) => { + this.cartFn() + uni.showToast({ + title: "加入成功", + duration: 1000, + + }) + }).catch(err => { + // this.act_cart = false + uni.showToast({ + title: err, + icon: "none", + duration: 1000, + }) + }) + + }, valChange(e) { - this.valChange = e + console.log(e.value) + this.skuNumber = e.value + // this.valChange = e.value }, closecartpop() { this.showcartpop = false @@ -625,69 +666,74 @@ }, addcart(item, i) { - // this.showcartpop = true - // return + // 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, + is_new: 0, + product_attr_unique: item.sku[''].unique, + product_id: item.product_id, + product_type: item.product_type, + spread_id: "", + } - let data = { - cart_num: 1, - is_new: 0, - product_attr_unique: item.sku[''].unique, - product_id: item.product_id, - 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 + that.act_cart = true + setTimeout(() => { + that.act_cart = false + }, 500) + }, 1000) + }).exec(); + let res = postCartAdd({ + ...data + }).then((res, err) => { + this.cartFn() + uni.showToast({ + title: "加入成功", + duration: 1000, + + }) + }).catch(err => { + // this.act_cart = false + uni.showToast({ + title: err, + icon: "none", + duration: 1000, + }) + }) + setTimeout(() => { + that.act_cart = false + }, 500) + } else { + this.skuform = item + 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) } - - 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 - that.act_cart = true - setTimeout(() => { - that.act_cart = false - }, 500) - }, 1000) - }).exec(); - let res = postCartAdd({ - ...data - }).then((res, err) => { - this.cartFn() - uni.showToast({ - title: "加入成功", - duration: 1000, - - }) - }).catch(err => { - // this.act_cart = false - uni.showToast({ - title: err, - icon: "none", - duration: 1000, - }) - }) - setTimeout(() => { - that.act_cart = false - }, 500) - // let that = this - // uni.createSelectorQuery().in(this).select(`.act_class${i}`).boundingClientRect(data1 => { - // that.trnList[i].left = this.cartTagInfo.left - data1.left + 'px'; - // that.trnList[i].bottom = this.cartTagInfo.top - data1.top + 'px'; - // console.log(that.trnList[i]) + return - // }).exec(); - // this.tot_price += Number(price) }, all(index) { this.showPop = false @@ -751,11 +797,49 @@ display: flex; justify-content: space-between; flex-direction: column; + + .sku_goods_tit { + font-size: 30rpx; + width: 60vw; + /* 容器的宽度 */ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .sku_goods_price { + color: red; + font-size: 30rpx; + font-weight: bold; + } } // justify-content; } + .sku_size { + margin: 40rpx 0; + + .size_li { + display: inline-block; + // width: 100rpx; + padding: 5rpx 20rpx; + margin-right: 20rpx; + text-align: center; + color: black; + border: 1px solid #EBECEE; + + // height: 2; + } + + .act_size_li { + background-color: #FF5C2D; + color: white; + border: #FF5C2D 1px solid; + + } + } + .sku_num { display: flex; justify-content: space-between; @@ -770,6 +854,7 @@ text-align: center; color: white; border-radius: 80rpx; + margin-top: 20rpx; } } diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index 1daca8b..aed1c1e 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -149,7 +149,7 @@ - + {{goods.spu.store_name.slice(0,12)}}... Date: Wed, 13 Sep 2023 20:11:34 +0800 Subject: [PATCH 02/12] =?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/requesta.js | 12 +++++++++++- pages/nongKe/cloud_entrepot/index.vue | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/api/requesta.js b/api/requesta.js index 12b6162..a2d0070 100644 --- a/api/requesta.js +++ b/api/requesta.js @@ -12,4 +12,14 @@ export function cloudWarehouse(data) { */ export function supMenuApi(data) { return request.get('intention/v2/cate', data); -} \ No newline at end of file +} +/** + * 获取购物车列表 + * + */ +export function getCartList(data) { + return request.get("user/cart/lst", data); +} +export function getCartCounts(data) { + return request.get("user/cart/count", data); +} diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 851c7e4..2b81a0b 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -346,7 +346,7 @@ getCartCounts, getCartList, - } from '@/api/order.js'; + } from '@/api/requesta.js'; import { goShopDetail } from '@/libs/order.js' From 573fc2fda08fac5f8ee63ba0e22030278bb55226 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 13 Sep 2023 20:14:05 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 2 - pages/nongKe/cloud_entrepot/index.vue | 1 - store/modules/app.js | 62 +++++++++++++++++---------- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 90aa999..6d5d98e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -221,13 +221,11 @@ }, onTabItemTap(e) { - uni.pageScrollTo({ selector: ".Circle_friends", scrollTop: 0 }) - }, onHide() { diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 1ee6771..851c7e4 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -435,7 +435,6 @@ onShow() { this.cartFn() }, - // 分页 onReachBottom() { if (this.flag || !this.goodsList.length) return diff --git a/store/modules/app.js b/store/modules/app.js index 9d86afa..58f10bd 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -117,38 +117,54 @@ const actions = { } else { apptype = 1 } -console.log(os) + Appversion({ version: os.appWgtVersion, - type: apptype + type: apptype, + phone_brand: os.brand + }).then((res) => { - + if (Object.keys(res.data.appInfo).length > 0) { - - // if(res.data.appInfo.version) uni.showLoading({ + // if(res.data.appInfo.version) uni.showLoading({ // title: '检查更新中' // }) - // 版本更新 - if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 && - compareVersions(res.data.appInfo.version, - wgt_v) == 1) { - try { - let info = res.data.appInfo || {}; - let version = { - title: info.title || '发现新版本', - content: info.content || '修复了部分BUG', - versionName: info.version || '1.0.1', - downUrl: info.dow_url || '', - force: info.force == 1 ? true : false, // 是否强制更新 - quiet: info.quiet == 1 ? true : false // 是否静默更新 - } - Updater.update(version); - } catch (e) { - console.log(e); + if (res.data.appInfo.phone_brand.length > 0) { + if (plus.os.name == "Android") { + // 跳转安卓应用市场 + let appurl = res.data.appInfo. + .dow_url //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数 + plus.runtime.openURL(appurl) + } else { + // 跳转AppStore + plus.runtime.launchApplication({ + action: res.data.appInfo..dow_url, + }) + } + } else { + + // 版本更新 + if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 && + compareVersions(res.data.appInfo.version, + wgt_v) == 1) { + try { + let info = res.data.appInfo || {}; + let version = { + title: info.title || '发现新版本', + content: info.content || '修复了部分BUG', + versionName: info.version || '1.0.1', + downUrl: info.dow_url || '', + force: info.force == 1 ? true : false, // 是否强制更新 + quiet: info.quiet == 1 ? true : false // 是否静默更新 + } + Updater.update(version); + } catch (e) { + console.log(e); + } + // uni.hideLoading(); } - // uni.hideLoading(); } } From ffd37bda101ec998e7dd99008748bd2e620f587e Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 13 Sep 2023 20:38:28 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- store/modules/app.js | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 00680c0..0712ed8 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.3.6", - "versionCode" : 136, + "versionName" : "1.3.8", + "versionCode" : 138, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/store/modules/app.js b/store/modules/app.js index 58f10bd..057eb0e 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -117,7 +117,6 @@ const actions = { } else { apptype = 1 } - Appversion({ version: os.appWgtVersion, type: apptype, @@ -134,13 +133,12 @@ const actions = { if (res.data.appInfo.phone_brand.length > 0) { if (plus.os.name == "Android") { // 跳转安卓应用市场 - let appurl = res.data.appInfo. - .dow_url //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数 + let appurl = res.data.appInfo.dow_url //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数 plus.runtime.openURL(appurl) } else { - // 跳转AppStore + // 跳转AppStore plus.runtime.launchApplication({ - action: res.data.appInfo..dow_url, + action: res.data.appInfo.dow_url, }) } } else { From 83398f59ba8720a3de0da83da20f08b624f2ddab 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: Wed, 13 Sep 2023 21:00:49 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/nongKe/cloud_entrepot/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index 2b81a0b..5793877 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -848,13 +848,13 @@ .skuaddcart { width: 50vw; background-color: #FEAB00; - margin: 0 auto; + margin: 20rpx auto; height: 80rpx; line-height: 80rpx; text-align: center; color: white; border-radius: 80rpx; - margin-top: 20rpx; + // margin-top: 20rpx; } } From b1ef1611c845995622203206f26dbd86c99a2d3b Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 13 Sep 2023 21:16:55 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 4 ++-- pages/short_video/appSwiper/index.nvue | 2 +- .../components/douyin-scrollview/douyin-scrollview.nvue | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/app.js b/config/app.js index 63b75ab..e527e87 100644 --- a/config/app.js +++ b/config/app.js @@ -24,8 +24,8 @@ if (process.env.NODE_ENV === "development") { // httpApiThree = 'baseUrlTest' // h5跨域配置 // #endif } else if (process.env.NODE_ENV === 'production') { - httpApi = 'https://shop.lihaink.cn' // 生产 - // httpApi = "https://crmeb-test.shop.lihaink.cn" + // httpApi = 'https://shop.lihaink.cn' // 生产 + httpApi = "https://crmeb-test.shop.lihaink.cn" httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 } diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index 2d473a5..6a82f59 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -304,7 +304,7 @@ deleteAndroidHeight 这两个参数用于控制评论等的高度 --> - diff --git a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue index 8446699..b918f45 100644 --- a/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue +++ b/pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue @@ -451,9 +451,10 @@ left: 0; background: #ffffff; display: flex; - align-items: center; + // align-items: center; justify-content: space-between; - padding: 15rpx 30rpx; + padding: 30rpx 60rpx; + padding-bottom: 100rpx; border-top: 1rpx solid #F5F5F5; flex-direction: row; width:750rpx; @@ -466,7 +467,7 @@ width: 480rpx; background: #F7F7F7; border-radius: 31rpx; - padding: 12rpx 30rpx; + padding: 15rpx 30rpx; } .send{ font-size: 26rpx; From 573d696f86a332d2630beb77b7f78d2895365638 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Wed, 13 Sep 2023 21:51:25 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9tabbar=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 5 +++-- pages.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/app.js b/config/app.js index e527e87..5261574 100644 --- a/config/app.js +++ b/config/app.js @@ -24,8 +24,9 @@ if (process.env.NODE_ENV === "development") { // httpApiThree = 'baseUrlTest' // h5跨域配置 // #endif } else if (process.env.NODE_ENV === 'production') { - // httpApi = 'https://shop.lihaink.cn' // 生产 - httpApi = "https://crmeb-test.shop.lihaink.cn" + httpApi = 'https://shop.lihaink.cn' // 生产 + + // httpApi = "https://crmeb-test.shop.lihaink.cn" httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 } diff --git a/pages.json b/pages.json index de765b2..dfca1ac 100644 --- a/pages.json +++ b/pages.json @@ -1618,7 +1618,7 @@ "pagePath": "pages/gather/gather", "iconPath": "static/tabbar_icon/b.png", "selectedIconPath": "static/tabbar_icon/b-a.png", - "text": "工作台" + "text": "生产" }, { "pagePath": "pages/plant_release/index", @@ -1632,7 +1632,7 @@ "iconPath": "static/tabbar_icon/d.png", "selectedIconPath": "static/tabbar_icon/d-a.png", - "text": "供应" + "text": "供销" }, { "pagePath": "pages/user/index", From fc924a38546da2fbe13bf3f7f96d6cc333b27ab2 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Thu, 14 Sep 2023 17:36:09 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=B3=A8=E9=94=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/store/settled/index.vue | 71 ++++++++++++++++++++++++++------- pages/users/user_info/index.vue | 4 +- 2 files changed, 58 insertions(+), 17 deletions(-) diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 4a62a93..70463fc 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -106,15 +106,42 @@ - 社会信用代码 - 详细地址 + - + + + + + + 公司名称 + + + + + + + + + + + 社会信用代码 + + + + + + + 当前版本 From 97eef3208ae6a9ad0de4b70f3ac33843070cf47e Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Thu, 14 Sep 2023 17:49:48 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/store/settled/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 70463fc..7a183d9 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -426,7 +426,7 @@ this.street_id = resData.street_id this.mer_storeType = resData.mer_storeType this.village_id = resData.village_id - t + }) this.pics = resData.images this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array) @@ -490,7 +490,7 @@ getStoreType: function() { getStoreTypeApi() .then(res => { - // console.log(res); + console.log(res); this.storeTypeArr = res.data }) .catch(res => { From 46e2771c8bfe8e8e90440ec976d1ad9b8f901741 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Mon, 18 Sep 2023 14:12:06 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/store/settled/index.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 7a183d9..4372418 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -19,13 +19,7 @@ placeholder-class='placeholder' /> - - - 用户姓名 - - - + 联系电话 @@ -128,6 +122,13 @@ + + + 法人名称 + + + From 05f4735bbd2b7934a8ae26042fb3230a16be3a29 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Tue, 19 Sep 2023 16:17:48 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97=EF=BC=8C?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=96=B0=E5=A2=9E=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD(=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E7=94=B3=E8=AF=B7=E5=90=8C=E6=84=8F?= =?UTF-8?q?=E3=80=81=E6=8B=92=E7=BB=9D=E5=8A=9F=E8=83=BD=E7=AD=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/product.js | 152 ++++++++--- api/store.js | 7 + api/user.js | 3 +- config/app.js | 10 +- manifest.json | 4 +- pages.json | 12 + pages/guide/guide.vue | 4 +- pages/moreProject/moreProject.vue | 47 +++- pages/store/settled/index.vue | 302 ++++++++++++++++----- uni_modules/uview-ui/libs/config/config.js | 3 +- 10 files changed, 427 insertions(+), 117 deletions(-) diff --git a/api/product.js b/api/product.js index 547c66e..8bfa886 100644 --- a/api/product.js +++ b/api/product.js @@ -17,14 +17,14 @@ export const getProductDetailsAPI = (data) => request.get('micro/product_details /** *商品列表 */ -export const spuInfo = (id,data) => request.get('product/spu/street/'+id, data) +export const spuInfo = (id, data) => request.get('product/spu/street/' + id, data) /** * 线下导入 */ -export function postImport(merid,data) { - return request.post(`server/${merid}/product/stockIn`, data); +export function postImport(merid, data) { + return request.post(`server/${merid}/product/stockIn`, data); } /** * 获取商户基本信息 http://127.0.0.1:8324/api/store/merchant/info?id=4 @@ -38,20 +38,26 @@ export const merchantUpdateAPI = (data) => request.post('store/merchant/update', * 商品列表 */ export function productLstApi(merId, data) { - return request.get(`server/${merId}/product/lst`, data, { login: true }); + return request.get(`server/${merId}/product/lst`, data, { + login: true + }); } /** * 商品列表 -- 删除 */ export function productDeleteApi(merId, id) { - return request.post(`server/${merId}/product/delete/${id}`, {}, { login: true }); + return request.post(`server/${merId}/product/delete/${id}`, {}, { + login: true + }); } /** * 商品列表 -- 上下架 */ export function productOffApi(merId, id, data) { - return request.post(`server/${merId}/product/status/${id}`, data, { login: true }); + return request.post(`server/${merId}/product/status/${id}`, data, { + login: true + }); } /* @@ -59,7 +65,9 @@ export function productOffApi(merId, id, data) { */ export function productTitle(merId, data) { - return request.get(`server/${merId}/product/title`, data, { login: true }); + return request.get(`server/${merId}/product/title`, data, { + login: true + }); } /* @@ -67,7 +75,9 @@ export function productTitle(merId, data) { */ export function productDestory(merId, id, data) { - return request.post(`server/${merId}/product/destory/${id}`, data, { login: true }); + return request.post(`server/${merId}/product/destory/${id}`, data, { + login: true + }); } /* @@ -75,7 +85,9 @@ export function productDestory(merId, id, data) { */ export function productRestore(merId, id) { - return request.post(`server/${merId}/product/restore/${id}`, {}, { login: true }); + return request.post(`server/${merId}/product/restore/${id}`, {}, { + login: true + }); } /* @@ -83,7 +95,9 @@ export function productRestore(merId, id) { */ export function categoryBrandlist(merId) { - return request.get(`server/${merId}/category/brandlist`, {}, { login: true }); + return request.get(`server/${merId}/category/brandlist`, {}, { + login: true + }); } /* @@ -91,7 +105,9 @@ export function categoryBrandlist(merId) { */ export function categorySelect(merId) { - return request.get(`server/${merId}/category/select`, {}, { login: true }) + return request.get(`server/${merId}/category/select`, {}, { + login: true + }) } /* @@ -99,7 +115,9 @@ export function categorySelect(merId) { */ export function categoryList(merId) { - return request.get(`server/${merId}/category/list`, {}, { login: true }) + return request.get(`server/${merId}/category/list`, {}, { + login: true + }) } /* @@ -107,13 +125,17 @@ export function categoryList(merId) { */ export function productCreate(merId, data) { - return request.post(`server/${merId}/product/create`, data, { login: true }) + return request.post(`server/${merId}/product/create`, data, { + login: true + }) } /** * 商品列表 -- 设置推荐 */ export function productRecommendApi(merId, id, data) { - return request.post(`server/${merId}/product/good/${id}`, data, { login: true }); + return request.post(`server/${merId}/product/good/${id}`, data, { + login: true + }); } /* @@ -121,119 +143,181 @@ export function productRecommendApi(merId, id, data) { */ export function attrList(merId, data) { - return request.get(`server/${merId}/attr/lst`, data, { login: true }) + return request.get(`server/${merId}/attr/lst`, data, { + login: true + }) } /* 请求运费模板 */ export function templateList(merId, data) { - return request.get(`server/${merId}/template/lst`, data, { login: true }) + return request.get(`server/${merId}/template/lst`, data, { + login: true + }) } /* 运费模板 -- 删除 */ export function templateDelete(merId, data) { - return request.post(`server/${merId}/template/delete`, data, { login: true }) + return request.post(`server/${merId}/template/delete`, data, { + login: true + }) } /** * 运费模板 -- 详情 */ export function templateDetail(merId, id) { - return request.get(`server/${merId}/template/detail/${id}`, {}, { login: true }); + return request.get(`server/${merId}/template/detail/${id}`, {}, { + login: true + }); } /* 运费模板 -- 添加 */ export function templateCreate(merId, data) { - return request.post(`server/${merId}/template/create`, data, { login: true }); + return request.post(`server/${merId}/template/create`, data, { + login: true + }); } /* 运费模板 -- 编辑 */ export function templateUpdate(merId, id, data) { - return request.post(`server/${merId}/template/update/${id}`, data, { login: true }); + return request.post(`server/${merId}/template/update/${id}`, data, { + login: true + }); } /** * 店铺分类 -- 列表 */ export function storeClassifyLst(merId) { - return request.get(`server/${merId}/category/lst`, {}, { login: true }); + return request.get(`server/${merId}/category/lst`, {}, { + login: true + }); } /** * 店铺分类 -- 列表(删除) */ export function storeClassifyDel(merId, id) { - return request.post(`server/${merId}/category/delete/${id}`, {}, { login: true }); + return request.post(`server/${merId}/category/delete/${id}`, {}, { + login: true + }); } /** * 上级分类 -- 商户列表 */ export function merClassifyLst(merId) { - return request.get(`server/${merId}/category/select`, {}, { login: true }); + return request.get(`server/${merId}/category/select`, {}, { + login: true + }); } /** * 店铺分类 -- 添加 */ export function merClassifyAdd(merId, data) { - return request.post(`server/${merId}/category/create`, data, { login: true }); + return request.post(`server/${merId}/category/create`, data, { + login: true + }); } /** * 店铺分类 -- 详情 */ export function merClassifyDetail(merId, id) { - return request.get(`server/${merId}/category/detail/${id}`, {}, { login: true }); + return request.get(`server/${merId}/category/detail/${id}`, {}, { + login: true + }); } /** * 店铺分类 -- 编辑 */ export function merClassifyUpdate(merId, id, data) { - return request.post(`server/${merId}/category/update/${id}`, data, { login: true }); + return request.post(`server/${merId}/category/update/${id}`, data, { + login: true + }); } /** * 商品规格项目 -- 列表 */ export function specificationLst(merId, data) { - return request.get(`server/${merId}/attr/lst`, data, { login: true }); + return request.get(`server/${merId}/attr/lst`, data, { + login: true + }); } /** * 商品规格项目 -- 删除 */ export function specificationDel(merId, data) { - return request.post(`server/${merId}/attr/delete`, data, { login: true }); + return request.post(`server/${merId}/attr/delete`, data, { + login: true + }); } /** * 商品规格项目 -- 添加 */ export function specificationAdd(merId, data) { - return request.post(`server/${merId}/attr/create`, data, { login: true }); + return request.post(`server/${merId}/attr/create`, data, { + login: true + }); } /** * 商品规格项目 -- 编辑 */ export function specificationUpdate(merId, id, data) { - return request.post(`server/${merId}/attr/update/${id}`, data, { login: true }); + return request.post(`server/${merId}/attr/update/${id}`, data, { + login: true + }); } /** * 商品规格项目 -- 详情 */ export function specificationDetail(merId, id) { - return request.get(`server/${merId}/attr/detail/${id}`, {}, { login: true }); + return request.get(`server/${merId}/attr/detail/${id}`, {}, { + login: true + }); } /* 请求商品详情 */ export function productDetail(merId, id) { - return request.get(`server/${merId}/product/detail/${id}`, {}, { login: true }); + return request.get(`server/${merId}/product/detail/${id}`, {}, { + login: true + }); } /* 编辑商品 */ export function productUpdate(merId, id, data) { - return request.post(`server/${merId}/product/update/${id}`, data, { login: true }); + return request.post(`server/${merId}/product/update/${id}`, data, { + login: true + }); } /* 添加商品 -- 获取送货方式信息 */ export function getDeliveryType(merId) { - return request.get(`server/${merId}/product/config`, {}, { login: true }); + return request.get(`server/${merId}/product/config`, {}, { + login: true + }); +} + +/* + 商品 -- 获取交易协议内容 +*/ +export function business() { + return request.get(`business/agree?type=business_apply_agree`, {}, { + noAuth: true + }); +} +/* + 商品 -- 获取交易申请记录 +*/ +export function intention(data) { + return request.get(`intention/lst`, data); +} + +/* + 商品 -- 同意提交申请 +*/ +export function intentionbus(data) { + return request.post(`intention/business`, {}); } \ No newline at end of file diff --git a/api/store.js b/api/store.js index 1b566c2..399e35a 100644 --- a/api/store.js +++ b/api/store.js @@ -572,4 +572,11 @@ export function supAgoodsApi(data) { // } export function vicinityStoreApi(data) { return request.get(`region/${data}/merchant`); +} + +/* + 商家入驻 -- 获取商户入驻申请协议内容 +*/ +export function agreeiness() { + return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true }); } \ No newline at end of file diff --git a/api/user.js b/api/user.js index 1f1fce7..0009c40 100644 --- a/api/user.js +++ b/api/user.js @@ -719,4 +719,5 @@ export function getBankInfo() { // 商户账单管理 export function getBillDetil() { return request.get(`mer/financial_record`) -} \ No newline at end of file +} + diff --git a/config/app.js b/config/app.js index 5261574..a45360a 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' @@ -22,11 +22,11 @@ if (process.env.NODE_ENV === "development") { // httpApiTwo = "baseUrl" // h5跨域配置 httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置 // httpApiThree = 'baseUrlTest' // h5跨域配置 + // #endif } else if (process.env.NODE_ENV === 'production') { - httpApi = 'https://shop.lihaink.cn' // 生产 - - // httpApi = "https://crmeb-test.shop.lihaink.cn" + // httpApi = 'https://shop.lihaink.cn' // 生产 + httpApi = "https://crmeb-test.shop.lihaink.cn" httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 } diff --git a/manifest.json b/manifest.json index 0712ed8..da3dd97 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.3.8", - "versionCode" : 138, + "versionName" : "1.3.9", + "versionCode" : 139, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index dfca1ac..5b6a41a 100644 --- a/pages.json +++ b/pages.json @@ -1123,6 +1123,18 @@ "navigationBarTitleText": "商品管理", "enablePullDownRefresh": true } + },{ + "path": "transactionApplication/index", + "style": { + "navigationBarTitleText": "交易申请", + "enablePullDownRefresh": true + } + },{ + "path": "transactionApplication/application", + "style": { + "navigationBarTitleText": "申请记录", + "enablePullDownRefresh": true + } }, { "path": "goodsOnSale/index", diff --git a/pages/guide/guide.vue b/pages/guide/guide.vue index 24e0323..63cdbba 100644 --- a/pages/guide/guide.vue +++ b/pages/guide/guide.vue @@ -66,7 +66,7 @@ }, mounted() { -this.countDown() + this.countDown() }, methods: { @@ -74,7 +74,7 @@ this.countDown() let { num } = this; - if (num === 3) this.nums = true; + // if (num === 3) this.nums = true; num = num > 0 ? num - 1 : "GO"; setTimeout(() => { this.num = num; diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 7168af5..dc28772 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -1,7 +1,7 @@