mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改tabbar名称 更新视频搜索 边距 多规格商品加入购物车

Browse Source
This commit is contained in:
jia 2023-09-13 22:29:46 +08:00
parent 178c2ad401
commit d2d6849a3f
10 changed files with 2734 additions and 2555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/requesta.js
View File

@ -13,3 +13,13 @@ export function cloudWarehouse(data) {
export function supMenuApi(data) {
return request.get('intention/v2/cate', data);
}
/**
* 获取购物车列表
*
*/
export function getCartList(data) {
return request.get("user/cart/lst", data);
}
export function getCartCounts(data) {
return request.get("user/cart/count", data);
}

1
config/app.js
View File

@ -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' //生产

4
manifest.json
View File

@ -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" : {

4
pages.json
View File

@ -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",

4966
pages/goods_details/index.vue
View File

File diff suppressed because it is too large Load Diff

2
pages/index/index.vue
View File

@ -220,13 +220,11 @@
},
onTabItemTap(e) {
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
},
onHide() {

218
pages/nongKe/cloud_entrepot/index.vue
View File

@ -265,19 +265,19 @@
<view class="sku">
<view class="sku_head">
<view class="sku_head_l">
<u--image :showLoading="true" src="/static/images/BG.png" width="200.09rpx"
<u--image :showLoading="true" :src="skuform.image" width="200.09rpx"
height="200.09rpx"></u--image>
</view>
<view class="sku_head_r">
<view class="sku_goods_tit">
fsdfsdfsdfffffffff
{{skuform.store_info}}
</view>
<view class="">
<view class="sku_goods_price">
79.00
￥ {{skuform.price}}
</view>
<view class="sku_goods_num">
库存:999
<view class="sku_goods_num" v-if="this.skusize">
库存:{{skuform.sku[this.skusize].stock}}
</view>
</view>
</view>
@ -285,11 +285,14 @@
<view class="sku_size">
<view class="">
<view class="" style="margin-bottom: 10rpx;">
尺码
</view>
<view class="">
<text>大号</text>
<text class="size_li" :class="{act_size_li:item.sku==skusize}"
v-for="(item,index) in skuform.sku" @click="skusizechange(item.sku)">{{item.sku}}</text>
<!-- <text class="size_li">{item.sku}</text> -->
</view>
</view>
<view class="sku_num">
@ -300,9 +303,9 @@
<u-number-box v-model="skuNumber" @change="valChange"></u-number-box>
</view>
</view>
<view class="skuaddcart">
<view class="skuaddcart" @click="skuaddcart">
加入购物车
确定
</view>
@ -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;
}
}

11
pages/short_video/appSwiper/index.nvue
View File

@ -304,7 +304,7 @@
deleteAndroidHeight
这两个参数用于控制评论等的高度
-->
<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
<douyin-scrollview ref="comments" :deleteIOSHeight="36" :deleteAndroidHeight="15" :userInfo="userInfo"
@closeScrollview="closeScrollview" @successFul="pinlunFun"></douyin-scrollview>
</view>
</uni-popup>
@ -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,
})
}
})

7
pages/short_video/components/douyin-scrollview/douyin-scrollview.nvue
View File

@ -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;

58
store/modules/app.js
View File

@ -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();
}
}