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/config/app.js b/config/app.js index 63b75ab..5261574 100644 --- a/config/app.js +++ b/config/app.js @@ -25,6 +25,7 @@ if (process.env.NODE_ENV === "development") { // #endif } else if (process.env.NODE_ENV === 'production') { 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 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/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", 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/index/index.vue b/pages/index/index.vue index 79ab2dc..6cf4a98 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -220,13 +220,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 9abc0b4..5793877 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 @@ - + - 加入购物车 + 确定 @@ -343,7 +346,7 @@ getCartCounts, getCartList, - } from '@/api/order.js'; + } from '@/api/requesta.js'; import { goShopDetail } from '@/libs/order.js' @@ -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, @@ -427,7 +435,6 @@ onShow() { this.cartFn() }, - // 分页 onReachBottom() { if (this.flag || !this.goodsList.length) return @@ -515,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 @@ -626,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 @@ -752,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; @@ -765,12 +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; } } diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index 3f13657..6a82f59 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -304,7 +304,7 @@ deleteAndroidHeight 这两个参数用于控制评论等的高度 --> - @@ -653,6 +653,15 @@ that.$util.Tips({ title: res.message }); + // setTimeout(function() { + // uni.redirectTo({ + // url: '/pages/plantGrass/plant_user/index?id=' + + // item.uid + // }) + // }, 1000); + uni.navigateBack({ + delta: 1, + }) } }) 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; diff --git a/store/modules/app.js b/store/modules/app.js index 9d86afa..057eb0e 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -117,38 +117,52 @@ 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(); } }