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

Merge remote-tracking branch 'remotes/old/old' into wpf

Browse Source
This commit is contained in:
jia 2023-09-06 09:21:07 +08:00
commit 440914a9c3
15 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/WaterfallsFlow/WaterfallsFlows.vue
View File

@ -108,7 +108,6 @@ export default {
deep:true deep:true
}, },
mounted(){ mounted(){
this.getUserInfo() this.getUserInfo()
}, },

8
components/WaterfallsFlowItem/WaterfallsFlowItems.vue
View File

@ -1,16 +1,14 @@
<template> <template>
<view class="wf-item-page" @click="gogogo(item)"> <view class="wf-item-page" @click="gogogo(item)">
<image :src="item.image[0]" mode="widthFix" class="item-img" /> <image :src="item.image[0]" mode="widthFix" class="item-img" />
<view class="goods_item_img" v-if="item.video_link.length>0"> <view class="goods_item_img" v-if="item.video_link.length>0">
<image src="@/static/images/sp.png" mode="aspectFill"></image> <image src="@/static/images/sp.png" mode="aspectFit"></image>
</view> </view>
<view class="title">{{item.title}}</view> <view class="title">{{item.title}}</view>
<view class="item-info"> <view class="item-info">
<image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill" <image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFit"
class="info-avatar" /> class="info-avatar" />
<view class="info-nickname">{{ item.author.nickname }}</view> <view class="info-nickname">{{ item.author.nickname }}</view>
</view> </view>
@ -41,7 +39,6 @@
this.getUserInfo() this.getUserInfo()
}, },
methods: { methods: {
/** /**
* 获取个人用户信息 * 获取个人用户信息
@ -62,7 +59,6 @@
url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1` url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
// #endif // #endif
}) })
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}` url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`

4
config/app.js
View File

@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试 // let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
// httpApi = 'https://shop.lihaink.cn' // 生产 httpApi = 'https://shop.lihaink.cn' // 生产
httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222" // httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325" // httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325' // httpApi = 'http://192.168.0.108:8325'

9
pages.json
View File

@ -1513,7 +1513,6 @@
"selectedColor": "#E93323", "selectedColor": "#E93323",
"borderStyle": "white", "borderStyle": "white",
"backgroundColor": "#ffffff", "backgroundColor": "#ffffff",
"fontSize": "25rpx",
"list": [{ "list": [{
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "static/tabbar_icon/a.png", "iconPath": "static/tabbar_icon/a.png",
@ -1548,13 +1547,11 @@
} }
], ],
"midButton": { "midButton": {
"width": "78rpx", "width": "68px",
"height": "126rpx", "height": "70px",
"iconWidth": "78rpx", "iconWidth": "48px",
"pagePath": "pages/plant_release/index", "pagePath": "pages/plant_release/index",
"iconPath": "static/tabbar_icon/d.png", "iconPath": "static/tabbar_icon/d.png",
// "selectedIconPath": "static/tabbar_icon/d-a.png",
"text": "发布" "text": "发布"
} }

1
pages/columnGoods/goods_list/index.vue
View File

@ -77,7 +77,6 @@
<view v-else class='list'> <view v-else class='list'>
<WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/> <WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop"/>
</view> </view>
<view class='noCommodity' v-if="productList.length==0 && where.page > 1"> <view class='noCommodity' v-if="productList.length==0 && where.page > 1">
<view class='pictrue' style="margin: 60rpx auto;"> <view class='pictrue' style="margin: 60rpx auto;">
<image src='/static/images/noCart.png'></image> <image src='/static/images/noCart.png'></image>

22
pages/index/index.vue
View File

@ -213,6 +213,28 @@ export default {
}) })
}, },
onTabItemTap(e) {
if (e.text.length >= 4) {
uni.pageScrollTo({
selector: ".Circle_friends",
scrollTop: 0
})
}
},
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.getGoods()
},
mounted() {
this.selfLocation()
// #ifdef H5
// 监听页面滚动事件
window.addEventListener("scroll", this.scrolling);
// #endif
},
onTabItemTap (e) { onTabItemTap (e) {
if (e.text.length >= 4) { if (e.text.length >= 4) {
uni.pageScrollTo({ uni.pageScrollTo({

2
pages/nongKe/food/index.vue
View File

@ -710,7 +710,7 @@
overflow: hidden; overflow: hidden;
/* 超出部分隐藏 */ /* 超出部分隐藏 */
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 45vw; max-width: 40vw;
/* 使用省略号表示溢出的内容 */ /* 使用省略号表示溢出的内容 */
/* 可根据实际情况调整容器宽度 */ /* 可根据实际情况调整容器宽度 */

2
pages/nongKe/specialty/index.vue
View File

@ -713,7 +713,7 @@
overflow: hidden; overflow: hidden;
/* 超出部分隐藏 */ /* 超出部分隐藏 */
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 45vw; max-width: 40vw;
/* 使用省略号表示溢出的内容 */ /* 使用省略号表示溢出的内容 */
/* 可根据实际情况调整容器宽度 */ /* 可根据实际情况调整容器宽度 */

3
pages/nongKe/supply_chain/supplier.vue
View File

@ -767,7 +767,8 @@
.com_name { .com_name {
font-size: 33.29rpx; font-size: 33.29rpx;
// background-color: red; // background-color: red;
max-width: 45vw; // max-width: 45vw;
max-width: 40vw;
white-space: nowrap; white-space: nowrap;
/* 防止文字换行 */ /* 防止文字换行 */
overflow: hidden; overflow: hidden;

4
pages/nongKe/supply_chain/supplierA.vue
View File

@ -397,7 +397,7 @@
return item.merchant_category_id == options.merchant_category_id; return item.merchant_category_id == options.merchant_category_id;
}); });
if (options.tit) { if (options.tit) {
this.titName = "先货后款" options.tit == 1 ? this.titName = "先款后货" : this.titName = "先货后款"
return return
} }
this.titName = this.menuList[index].category_name this.titName = this.menuList[index].category_name
@ -739,7 +739,7 @@
overflow: hidden; overflow: hidden;
/* 超出部分隐藏 */ /* 超出部分隐藏 */
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 45vw; max-width: 40vw;
/* 使用省略号表示溢出的内容 */ /* 使用省略号表示溢出的内容 */
/* 可根据实际情况调整容器宽度 */ /* 可根据实际情况调整容器宽度 */

2
pages/nongKe/tourism/index.vue
View File

@ -713,7 +713,7 @@
overflow: hidden; overflow: hidden;
/* 超出部分隐藏 */ /* 超出部分隐藏 */
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 45vw; max-width: 40vw;
/* 使用省略号表示溢出的内容 */ /* 使用省略号表示溢出的内容 */
/* 可根据实际情况调整容器宽度 */ /* 可根据实际情况调整容器宽度 */

8
pages/product/basicSet.vue
View File

@ -132,7 +132,8 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话"> <input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
</view> </view>
<view class="item_cell flex_a_c">
<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view> <view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
<u-switch v-model="credit_buy" @change="change"></u-switch> <u-switch v-model="credit_buy" @change="change"></u-switch>
</view> </view>
@ -154,6 +155,7 @@
<text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text> <text style="color: #CCCCCC;">开启后，店铺即可展示在移动端</text>
</view> --> </view> -->
</view> </view>
<button class="submit_btn l_center" @click="postMerchantUpdata">提交审核</button> <button class="submit_btn l_center" @click="postMerchantUpdata">提交审核</button>
@ -265,7 +267,8 @@
credit_buy: false, //开启信用购 credit_buy: false, //开启信用购
interest_rate: '', //利率 interest_rate: '', //利率
settle_cycle: '', //周期 settle_cycle: '', //周期
mer_name:'' mer_name:'',
type_code:''
} }
}, },
onLoad(e) { onLoad(e) {
@ -295,6 +298,7 @@
res.data.mer_take_day.forEach((item, i) => { res.data.mer_take_day.forEach((item, i) => {
this.dateWeek[Number(item) - 1].isCheck = true this.dateWeek[Number(item) - 1].isCheck = true
}) })
this.type_code= res.data.type_code
this.mer_take_time = res.data.mer_take_time this.mer_take_time = res.data.mer_take_time
this.intro = res.data.mer_info this.intro = res.data.mer_info
this.cruxText = res.data.mer_keyword this.cruxText = res.data.mer_keyword

3
pages/short_video/nvueSwiper/index.nvue
View File

@ -775,8 +775,7 @@
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
id: this.videoID id: this.videoID
// is_star: that.isSatrt,
// community_id: that.videoID
}).then(res => { }).then(res => {
that.videoData(res.data.list) that.videoData(res.data.list)
if (res.data.list.length < that.limit) { if (res.data.list.length < that.limit) {

12
pages/supply_chains/supply_chains.vue
View File

@ -74,8 +74,7 @@
</view> </view>
<view class="list-con"> <view class="list-con">
<view class="list-con-left" <view class="list-con-left" @tap="navgo('/pages/nongKe/specialty/index')">
@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
<!-- <view class="list-con-title"> <!-- <view class="list-con-title">
<view class="con-titlea"> <view class="con-titlea">
名优特产 名优特产
@ -87,8 +86,7 @@
<image src="@/static/images/f5.png" mode="aspectFit"></image> <image src="@/static/images/f5.png" mode="aspectFit"></image>
</view> </view>
<view class="list-con-right"> <view class="list-con-right">
<view class="con-right" style="margin-bottom: 20rpx" <view class="con-right" style="margin-bottom: 20rpx" @click="navaction(1)">
@tap="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
<!-- <view class="list-con-title"> <!-- <view class="list-con-title">
<view class="con-titlea"> <view class="con-titlea">
当地美食 当地美食
@ -99,7 +97,7 @@
</view> --> </view> -->
<image src="@/static/images/f7.png" mode="aspectFit"></image> <image src="@/static/images/f7.png" mode="aspectFit"></image>
</view> </view>
<view class="con-right" @tap="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')"> <view class="con-right" @click="navaction(2)">
<!-- <view class="list-con-title"> <!-- <view class="list-con-title">
<view class="con-titlea"> <view class="con-titlea">
特色文旅 特色文旅
@ -255,6 +253,10 @@
this.list() this.list()
}, },
beforeDestroy () {
// 销毁监听事件
this.$bus.$off('value-updated')
},
mounted() { mounted() {
// #ifdef H5 // #ifdef H5

2
pages/users/supply_procurement/index.vue
View File

@ -10,7 +10,7 @@
</view> </view>
</view> </view>
<view class="con_kuo" <view class="con_kuo"
@click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}&credit_buy=1`)"> @click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=2&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
<image class="con_img" src="@/static/images/bg2.png" mode=""></image> <image class="con_img" src="@/static/images/bg2.png" mode=""></image>
<image class="con_ico" src="@/static/images/bgic2.png" mode=""></image> <image class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
<view class="con_text"> <view class="con_text">