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

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into wpf

Browse Source
This commit is contained in:
weipengfei 2023-09-05 16:52:40 +08:00
commit 9c2bd07e8a
27 changed files with 5469 additions and 3329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
App.vue
View File

@ -10,7 +10,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// #ifdef APP-PLUS // #ifdef APP-PLUS
let jpushModule = uni.requireNativePlugin("JG-JPush"); let jpushModule = uni.requireNativePlugin("JG-JPush");
const mp = uni.requireNativePlugin('uniMP'); const mp = uni.requireNativePlugin('uniMP');
// #endif // #endif
import { import {
checkLogin checkLogin
@ -76,19 +76,17 @@
onLaunch: function(option) { onLaunch: function(option) {
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid; this.globalData.uid = this.$store.state.app.uid;
// #ifdef APP-PLUS //监听uni小程序发送的事件
//监听uni小程序发送的事件 mp.onUniMPEventReceive(ret => {
mp.onUniMPEventReceive(ret=>{ console.log('小程序事件: ', ret);
console.log('小程序事件: ', ret); if (ret.event == 'closeApp') {
if(ret.event=='closeApp'){ mp.closeUniMP(ret.fromAppid, (ret) => {
mp.closeUniMP(ret.fromAppid, (ret)=>{ console.log('closeUniMP: ' + JSON.stringify(ret));
console.log('closeUniMP: '+JSON.stringify(ret)); });
}); }
} });
});
// #endif
let that = this; let that = this;
// #ifdef MP // #ifdef MP
if (HTTP_REQUEST_URL == '') { if (HTTP_REQUEST_URL == '') {
@ -231,6 +229,20 @@
}, 1500) }, 1500)
// #endif // #endif
}, },
mounted() {
uni.onTabBarMidButtonTap((e) => {
// console.log("点击了", e);
uni.switchTab({
url: '/pages/plant_release/index'
})
// uni.navigateTo({
// url: '/pages/plant_release/index'
// })
});
uni.setTabBarItem((e) => { console.log("点击了", e)});
},
methods: { methods: {
/** /**
* 语音播报 * 语音播报

25
pages.json
View File

@ -216,7 +216,7 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "supply_chain/suppliers", "path": "supply_chain/suppliers",
"style": { "style": {
@ -278,6 +278,22 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, {
"path": "food/index",
"style": {
"navigationBarTitleText": "当地美食",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
}, {
"path": "tourism/index",
"style": {
"navigationBarTitleText": "特色文旅",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
} }
] ]
}, },
@ -1497,6 +1513,7 @@
"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",
@ -1513,10 +1530,12 @@
"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", "selectedIconPath": "static/tabbar_icon/d-a.png",
"text": "发布" "text": "发布",
"visible":false
}, },
{ {
"pagePath": "pages/supply_chains/supply_chains", "pagePath": "pages/supply_chains/supply_chains",
"iconPath": "static/tabbar_icon/c.png", "iconPath": "static/tabbar_icon/c.png",
"selectedIconPath": "static/tabbar_icon/c-a.png", "selectedIconPath": "static/tabbar_icon/c-a.png",
"text": "供应" "text": "供应"
@ -1529,7 +1548,7 @@
} }
], ],
"midButton": { "midButton": {
"width": "138rpx", "width": "78rpx",
"height": "126rpx", "height": "126rpx",
"iconWidth": "78rpx", "iconWidth": "78rpx",
"pagePath": "pages/plant_release/index", "pagePath": "pages/plant_release/index",

1969
pages/activity/combination_details/index.vue
View File

File diff suppressed because it is too large Load Diff

33
pages/gather/gather.vue
View File

@ -31,7 +31,7 @@
:show="jurisdiction" :show="jurisdiction"
mode="permission" mode="permission"
:text="emptyText" :text="emptyText"
icon="/static/empty/permission.png" icon="http://cdn.uviewui.com/uview/empty/permission.png"
></u-empty> ></u-empty>
<view class="business com special_work" v-if="jurisdiction == false"> <view class="business com special_work" v-if="jurisdiction == false">
<view class="title project"> <view class="title project">
@ -101,9 +101,12 @@
</view> </view>
</view> </view>
<!-- <view class="" v-if="jurisdiction == false && isShow == false"> <view class="" v-if="jurisdiction == false && isShow == false">
<emptyPage title="暂无信息"></emptyPage> <emptyPage title="暂无信息"></emptyPage>
</view> --> </view>
<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
</view> </view>
</template> </template>
@ -139,9 +142,7 @@ import {
import { import {
getDiy getDiy
} from '@/api/api.js'; } from '@/api/api.js';
// #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js'; import uniMP from '@/utils/uniMP.js';
// #endif
export default { export default {
components: { components: {
@ -183,8 +184,8 @@ export default {
], ],
nowMenuList: [], nowMenuList: [],
street: '', street: '',
showPicker: false, showPicker: false,
columnData: [], columnData: [],
bgColor: '', bgColor: '',
isFshow: false, isFshow: false,
backColor: 'rgba(252, 252, 252, 0)' backColor: 'rgba(252, 252, 252, 0)'
@ -337,7 +338,7 @@ export default {
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList)); uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
}, },
getUniMp (appid) { getUniMp (appid) {
console.log('点击小程序'); console.log('点击供销平台');
// #ifdef APP-PLUS // #ifdef APP-PLUS
uniMP.loadMP(appid); uniMP.loadMP(appid);
return; return;
@ -364,14 +365,14 @@ export default {
} }
}, },
Area () { Area() {
getArea({ getArea({
city_code: 510500 city_code: 510500
}).then(res => { }).then(res => {
this.$refs.uPicker.setColumnValues(0, res.data); this.$refs.uPicker.setColumnValues(0, res.data);
this.Street(res.data[0]['code']); this.Street(res.data[0]['code']);
}); });
}, },
Street (code) { Street (code) {
getStreet({ getStreet({
area_code: code area_code: code

2055
pages/index/index.vue
View File

File diff suppressed because it is too large Load Diff

1308
pages/nongKe/food/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

324
pages/nongKe/specialty/indexa.vue Normal file
View File

@ -0,0 +1,324 @@
<template>
<view class="box">
<view class="head">
<view style="height: var(--status-bar-height);"></view>
<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
height="748.25rpx" @click="click"></u--image> -->
<view class="head_tit">
<view class="head_tit_l">
<view class="iconfont icon-xiangzuo"></view>
<view
style="font-size: 40rpx;font-weight: 700;margin-left: 30rpx; transform: skewX(-10deg);color:white;">
名优特产
</view>
</view>
<view class="head_tit_r" style="font-size: 29.79rpx;">
江阳区 <text style="margin-left: 10rpx;" class="iconfont icon-xiangxia"></text>
<view class="" style="font-size: 22.78rpx;">
晴天30℃
</view>
</view>
</view>
<view class="head_serch">
<view style="position: relative;">
<!-- <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="keyword" class="serch_cls"></u-search> -->
<!-- <u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image> -->
</view>
</view>
<view class="head_content">
<view style="font-size: 40rpx;font-weight: 700;color:white; margin-bottom: 10rpx;">
精选特产
</view>
<view class="head_content_card">
<u-scroll-list>
<view v-for="(item, index) in list" :key="index" class="goods_card">
<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
width="210.28rpx" height="210.28rpx"></u--image>
<view class="goods_tit">
笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
</view>
<view class="goods_price">
￥ 10.00
</view>
<!-- <image :src="item.thumb"></image> -->
</view>
</u-scroll-list>
</view>
</view>
</view>
<view class="store" style="background-color: white;">
<view class="goods_list">
<view class="goods_cards" @click="goStore(item.mer_id)" v-for="(item,index) in storeList" :key="index">
<view class="left">
<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
height="157.71rpx"></u--image>
</view>
<view class="right">
<view class="li heads" style="display: flex;">
<text class="flag">特产</text>
<text class="com_name">{{item.mer_name}}</text>
<text
style="font-weight: normal; font-size: 10rpx;color: #737373;padding:0 10rpx; border-radius: 10rpx; border: 1px solid #737373;">{{item.type_name}}</text>
</view>
<view class="li">
<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
<text style="margin-left: 10rpx;color: #FF6D20; ">5.0</text>
<text>月销2000+</text>
<text>20分钟</text>
<text>1.1km</text>
</view>
<view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
height="33.85rpx"></u--image>
<text> {{item.service_phone}}</text>
</view>
<view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
height="33.85rpx"></u--image>
<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
</view>
<view class="li" style="align-items: center;">
<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
height="33.85rpx"></u--image>
<text class="address">{{item.mer_address}}</text>
</view>
<view class="">
<u-scroll-list>
<view v-for="(item, index) in list" :key="index" style="margin-right: 20rpx;">
<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
width="164.72rpx" height="164.72rpx"></u--image>
<view class="goods_tit_a">
笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
</view>
<view style="color: red;">
$10.00
</view>
<!-- <image :src="item.thumb"></image> -->
</view>
<!-- <view v-for="(item, index) in list" :key="index">
<image :src="item.thumb"></image>
</view> -->
</u-scroll-list>
</view>
<!-- <view class="">
<u-scroll-list>
<view v-for="(item, index) in list" :key="index" class="goods_card_a">
<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
width="164.72rpx" height="164.72rpx" @click="click"></u--image>
<view class="goods_tit_a">
笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
</view>
<view class="goods_price">
$10.00
</view>
</view>
</u-scroll-list>
</view>
-->
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {
storeMerchantList,
} from '@/api/store.js';
export default {
data() {
return {
keyword: "",
list: [1, 1, 1, 11, 1, 11, 11],
storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
}
},
onLaunch() {
console.log(46545)
// storeMerchantList().then(res => {
// // this.count = res.data.count
// // this.storeList = this.storeList.concat(res.data.list)
// // this.loading = false
// // this.loadingIcon = false
// console.log(res)
// })
},
onShow() {
// console.log(46545)
storeMerchantList().then(res => {
// this.count = res.data.count
this.storeList = res.data.list
// this.loading = false
// this.loadingIcon = false
// console.log(res)
})
},
methods: {},
onPullDownRefresh() {
uni.stopPullDownRefresh()
}
}
</script>
<style lang="scss" scoped>
.head {
// background-color: #F94621;
background: url('/static/images/MYTC/BG.png') no-repeat;
padding: 20rpx;
border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
.head_tit {
display: flex;
justify-content: space-between;
color: white;
// margin-bottom: 20rpx;
.head_tit_l {
display: flex;
align-items: center;
}
.head_tit_r {
// display: flex;
// align-items: center;
}
}
.head_serch {
margin: 20rpx 0;
}
.head_content {
.head_content_card {
background: linear-gradient(to bottom, #FCB9AD, #FFFBF9, #FFFFFF);
border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
overflow: hidden;
padding: 20rpx 10rpx;
.goods_card {
margin-right: 20rpx;
}
.goods_tit {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.goods_price {
color: #F84221;
font-size: 29.79rpx;
}
}
}
}
.store {
.goods_list {
margin-top: 20rpx;
.goods_cards {
margin-top: 20rpx;
height: auto;
background-color: white;
padding: 20rpx;
border-radius: 20rpx;
display: flex;
// align-items: center;
.left {
margin-right: 20rpx;
width: 158rpx;
height: 158rpx;
// background-color: red;
border-radius: 20rpx;
overflow: hidden;
}
.right {
// box-sizing: border-box;
width: 75vw;
overflow: hidden;
// background-color: red;
.heads {
font-weight: bold;
.flag {
background: linear-gradient(to bottom, #F84221, #FF6D20);
width: 66.59rpx;
height: 36.8rpx;
text-align: center;
font-size: 22.78rpx;
color: white;
border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
}
}
.goods_card_a {
margin-right: 20rpx;
}
.goods_price_a {
color: #F84221;
}
.goods_tit_a {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.li {
display: flex;
font-size: 26.29rpx;
margin-bottom: 10rpx;
align-items: center;
color: #737373;
text {
margin: 0 10rpx 0;
}
}
}
}
}
.address {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 200px;
}
}
</style>

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

@ -7,22 +7,26 @@
<view style="height: 10px;"> <view style="height: 10px;">
</view> </view>
<view style="display: flex;justify-content: space-around; align-items: center;">
<view class="back" @click='backjJump()'>
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view> <view class="head_tit">
</view> <view class="" style="display: flex;align-items: center;">
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);"> <view class="back" @click='backjJump()' style="margin-right: 17rpx;">
供销综合云市场 <view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
供销综合云市场
</view>
</view> </view>
<view style="position: relative;width: 289.14rpx;"> <view style="position: relative;width: 289.14rpx;">
<!-- <text class='iconfont icon-sousuo'></text> <!-- <text class='iconfont icon-sousuo'></text>
<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search" <input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
:value='sotreParam.keyword' @confirm="searchSubmit"></input> --> :value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
<u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false" <u-search borderColor="#FF6D20" bgColor="white" @change="test" :showAction="false"
placeholder="请输入..." v-model="sotreParam.keyword" class="serch_cls"></u-search> placeholder="请输入..." v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;" <u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx" src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
height="56.82rpx"></u--image>
</view> </view>
<view class='iconfont search-right' <view class='iconfont search-right'
@click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)"> @click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)">
@ -30,6 +34,9 @@
height="50.82rpx"></u--image> height="50.82rpx"></u--image>
</view> </view>
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<view style="background-color: red;height: 10px"> <view style="background-color: red;height: 10px">
@ -771,6 +778,14 @@
/* 可根据实际情况调整容器宽度 */ /* 可根据实际情况调整容器宽度 */
} }
.head_tit {
display: flex;
justify-content: space-between;
align-items: center;
box-sizing: border-box;
padding: 0 20rpx;
}
.productList { .productList {
// padding-top: 50rpx; // padding-top: 50rpx;
// padding: 0 20rpx 0; // padding: 0 20rpx 0;
@ -1350,6 +1365,14 @@
margin: 30px auto; margin: 30px auto;
} }
.img_cls {
position: absolute;
top: 50%;
right: 7rpx;
transform: translateY(-50%);
}
.pop { .pop {
z-index: 1; z-index: 1;
} }

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

@ -6,12 +6,17 @@
<view class="top"> <view class="top">
<view style="height: 10px;"> <view style="height: 10px;">
</view> </view>
<view style="display: flex;justify-content: space-around; align-items: center;"> <view class="head_tit">
<view class="back" @click='backjJump()'> <view class="" style="display: flex;align-items: center;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view> <view class="back" @click='backjJump()' style="margin-right: 17rpx;">
<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
</view>
<view class="" style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);">
{{titName}}
</view>
</view> </view>
<view style="font-size: 40rpx;font-weight: 700;transform: skewX(-10deg);"> <view class="">
{{titName}}
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<!-- <text class='iconfont icon-sousuo'></text> <!-- <text class='iconfont icon-sousuo'></text>
@ -19,9 +24,8 @@
:value='sotreParam.keyword' @confirm="searchSubmit"></input> --> :value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称" <u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
v-model="sotreParam.keyword" class="serch_cls"></u-search> v-model="sotreParam.keyword" class="serch_cls"></u-search>
<u--image @tap="searchSubmit" class="img_cls" style="position: absolute; top: 3px;right: 3px;" <u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx" src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"></u--image>
height="56.82rpx"></u--image>
</view> </view>
</view> </view>
@ -374,6 +378,7 @@
if (options.street_id != undefined) { if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id this.sotreParam.street_id = options.street_id
} }
this.credit_buy = options.credit_buy this.credit_buy = options.credit_buy
this.sotreParam.type_id = options.type_id this.sotreParam.type_id = options.type_id
this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || '' this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
@ -391,7 +396,14 @@
let index = this.menuList.findIndex((item) => { let index = this.menuList.findIndex((item) => {
return item.merchant_category_id == options.merchant_category_id; return item.merchant_category_id == options.merchant_category_id;
}); });
if (options.tit) {
this.titName = "先货后款"
return
}
this.titName = this.menuList[index].category_name this.titName = this.menuList[index].category_name
// console.log(this.menuList) // console.log(this.menuList)
}) })
// console.log(this.menuList) // console.log(this.menuList)
@ -1034,6 +1046,14 @@
margin-left: 10rpx; margin-left: 10rpx;
} }
.head_tit {
display: flex;
justify-content: space-between;
align-items: center;
box-sizing: border-box;
padding: 0 20rpx;
}
.store-wrapper { .store-wrapper {
margin-top: 235rpx; margin-top: 235rpx;
border-top: 1px solid #F6F6F6; border-top: 1px solid #F6F6F6;
@ -1307,13 +1327,11 @@
} }
} }
.guanbi { .img_cls {
width: 20px; position: absolute;
height: 20px; top: 50%;
margin: 30px auto; right: 7rpx;
} transform: translateY(-50%);
.pop {
z-index: 1;
} }
</style> </style>

1311
pages/nongKe/tourism/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -320,7 +320,7 @@
<view class="sys-head" :style="{height:statusBarHeight}"></view> <view class="sys-head" :style="{height:statusBarHeight}"></view>
<view class="tool-bar" @click='goBack()'> <view class="tool-bar" @click='goBack()'>
<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image> <image class="icon-xiangzuo" src="@/static/image/icon-back.png"></image>
</view> </view>
</view> </view>
</view> </view>
@ -704,8 +704,13 @@
// }); // });
// })' // })'
// that.isUser ? // that.isUser ?
videoList().then(res=>{ videoList({
that.getVideoData(res.data.list); page: that.page,
limit: that.limit,
id:this.videoID
}).then(res=>{
that.getVideoData(res.data.list);
}) })
@ -1325,7 +1330,7 @@
.userInfo { .userInfo {
position: absolute; position: absolute;
bottom: 120px; bottom: 400rpx;
right: 10px; right: 10px;
display: flex; display: flex;
align-items: center; align-items: center;

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

@ -15,10 +15,14 @@
<!-- 头部导航 --> <!-- 头部导航 -->
<!-- <view v-if="!isUser" class="header" :style="{backgroundColor:'#Fff'}">
<view class="header"> <view class="header">
<view class="tool-bar"> <view class="tool-bar">
<view class='xiangzuo' @tap='goBack'>
<image src="@/static/images/icon-back.png" mode="aspectFit"></image>
</view>
</view>
<!-- <view class="tool-bar">
<view class='iconfont icon-xiangzuo' @tap='goBack'></view> <view class='iconfont icon-xiangzuo' @tap='goBack'></view>
</view> </view>
<view class="items" @click.stop="navTap(2)"> <view class="items" @click.stop="navTap(2)">
@ -32,11 +36,12 @@
</view> </view>
<view class="items" @click.stop="navTap(4)"> <view class="items" @click.stop="navTap(4)">
<text class="tName" :class="currentNav==4?'on':''">社区</text> <text class="tName" :class="currentNav==4?'on':''">社区</text>
</view> </view> -->
</view> --> </view>
<swiper v-show="currentNav !== 3&&currentNav != 4" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" <swiper v-show="currentNav !== 3&&currentNav != 4"
:vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false"> :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :vertical="true"
@animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
<swiper-item v-for="(list,index) in dataList"> <swiper-item v-for="(list,index) in dataList">
<view v-if="max > index"> <view v-if="max > index">
@ -250,7 +255,7 @@
</view> </view>
</block> </block>
</scroll-view> </scroll-view>
<!-- <view class="video-list" v-if="currentNav === 3" <!-- <view class="video-list" v-if="currentNav === 3"
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"> :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
@ -318,7 +323,7 @@
} from '@/utils'; } from '@/utils';
import comment from '@/components/comment.vue'; import comment from '@/components/comment.vue';
import mentioned from '@/components/mentioned.vue'; import mentioned from '@/components/mentioned.vue';
import { import {
HTTP_REQUEST_URL HTTP_REQUEST_URL
} from '@/config/app'; } from '@/config/app';
@ -344,12 +349,12 @@
comment, comment,
mentioned, mentioned,
authorize, authorize,
}, },
computed: configMap({ computed: configMap({
community_reply_status: 0 community_reply_status: 0
}, mapGetters(['isLogin', 'uid'])), }, mapGetters(['isLogin', 'uid'])),
data() { data() {
return { return {
isTriggered: false, isTriggered: false,
@ -425,6 +430,7 @@
communityId: '', communityId: '',
Listcount: '', Listcount: '',
loadMore: true, loadMore: true,
videoshow: true
} }
}, },
watch: { watch: {
@ -742,28 +748,49 @@
} }
}, },
get() { get() {
let that = this let that = this
// 1.这里引入后端请求数据 // 1.这里引入后端请求数据
if(this.videoID){ if (that.videoshow) {
deoList(this.videoID).then(res => { deoList(this.videoID).then(res => {
that.videoData([res.data]) that.videoData([res.data])
if (res.data.list.length < that.limit) { if (res.data.list.length < that.limit) {
this.loadMore = false; this.loadMore = false;
} }
}).catch(err => { }).catch(err => {
return uni.showToast({ return uni.showToast({
title: err, title: err,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
}) })
this.videoID='' this.videoshow = false
}else{ } else {
videoList().then(res=>{ // videoList().then(res=>{
that.videoData(res.data.list); // that.videoData(res.data.list);
}) // })
} // console.log(that.userUid,that.videoID)
videoList({
page: that.page,
limit: that.limit,
id: this.videoID
// is_star: that.isSatrt,
// community_id: that.videoID
}).then(res => {
that.videoData(res.data.list)
if (res.data.list.length < that.limit) {
this.loadMore = false;
}
}).catch(err => {
return uni.showToast({
title: err,
icon: 'none',
duration: 2000
});
})
}
// that.isUser ? // that.isUser ?
// myVideoList(that.userUid, { // myVideoList(that.userUid, {
// page: that.page, // page: that.page,
@ -781,7 +808,8 @@
// icon: 'none', // icon: 'none',
// duration: 2000 // duration: 2000
// }); // });
// }) : // })
//:
// graphicLstApi({ // graphicLstApi({
// page: that.page, // page: that.page,
// limit: that.limit, // limit: that.limit,
@ -1307,12 +1335,16 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
.icon-xiangzuo { .xiangzuo {
width: 23rpx;
height: 42rpx;
margin-right: 40rpx; margin-right: 40rpx;
margin-left: 20rpx; margin-left: 20rpx;
font-size: 30rpx;
color: #333; image {
margin-top: 60rpx; width: 100%;
height: 100%;
}
} }
} }
@ -1413,7 +1445,7 @@
.userInfo { .userInfo {
position: absolute; position: absolute;
bottom: 60rpx; bottom: 420rpx;
right: 20rpx; right: 20rpx;
flex-direction: column; flex-direction: column;
text-align: center; text-align: center;

8
pages/supply_chains/supply_chains.vue
View File

@ -74,7 +74,8 @@
</view> </view>
<view class="list-con"> <view class="list-con">
<view class="list-con-left" @tap="navgo('/pages/nongKe/specialty/index')"> <view class="list-con-left"
@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">
名优特产 名优特产
@ -86,7 +87,8 @@
<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" @click="navaction(1)"> <view class="con-right" style="margin-bottom: 20rpx"
@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">
当地美食 当地美食
@ -97,7 +99,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" @click="navaction(2)"> <view class="con-right" @tap="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
<!-- <view class="list-con-title"> <!-- <view class="list-con-title">
<view class="con-titlea"> <view class="con-titlea">
特色文旅 特色文旅

40
pages/users/order_confirm/index.vue
View File

@ -1301,6 +1301,7 @@
}); });
}, },
fail: (e) => { fail: (e) => {
console.log(e,'111111111')
// 暂不跳转 // 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId + let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付' + '&product_type=' + that.product_type; '&msg=取消支付' + '&product_type=' + that.product_type;
@ -1311,16 +1312,17 @@
url: url url: url
}); });
}, },
complete: () => { complete: (res) => {
uni.hideLoading();
// 暂不跳转 // 暂不跳转
let url = '/pages/order_pay_status/index?order_id=' + orderId + // let url = '/pages/order_pay_status/index?order_id=' + orderId +
'&msg=取消支付' + '&product_type=' + that.product_type; // '&msg=取消支付' + '&product_type=' + that.product_type;
return that.$util.Tips({ // return that.$util.Tips({
title: '取消支付', // title: '取消支付',
}, { // }, {
tab: 4, // tab: 4,
url: url // url: url
}); // });
}, },
}); });
// #endif // #endif
@ -1414,17 +1416,17 @@
}, },
complete: () => { complete: () => {
uni.hideLoading(); uni.hideLoading();
// 暂不跳转 // // 暂不跳转
let pages = '/pages/order_pay_status/index?order_id=' + // let pages = '/pages/order_pay_status/index?order_id=' +
orderId + '&msg=取消支付' + '&product_type=' + that // orderId + '&msg=取消支付' + '&product_type=' + that
.product_type // .product_type
return that.$util.Tips({ // return that.$util.Tips({
title: '取消支付' // title: '取消支付'
}, { // }, {
tab: 5, // tab: 5,
url: pages // url: pages
}); // });
}, },
}); });
break; break;

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

@ -1,6 +1,7 @@
<template> <template>
<view class="conent"> <view class="conent">
<view class="con_kuo" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1&product_type=98&cate_id=${id}`)"> <view class="con_kuo"
@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
<image class="con_img" src="@/static/images/bg1.png" mode=""></image> <image class="con_img" src="@/static/images/bg1.png" mode=""></image>
<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image> <image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
<view class="con_text"> <view class="con_text">
@ -8,9 +9,10 @@
<span>先付款后发货</span> <span>先付款后发货</span>
</view> </view>
</view> </view>
<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`)"> <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`)">
<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">
<h3>先货后款</h3> <h3>先货后款</h3>
<span>先发货后付款</span> <span>先发货后付款</span>
@ -21,16 +23,16 @@
<script> <script>
export default { export default {
data(){ data() {
return{ return {
id:'' id: ''
} }
}, },
onLoad(option) { onLoad(option) {
this.id=option.cate_id this.id = option.cate_id
}, },
methods:{ methods: {
navigator(url, t) { navigator(url, t) {
uni.navigateTo({ uni.navigateTo({
url: url url: url
@ -38,33 +40,37 @@
}, },
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
*{ * {
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
.conent{
.conent {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
margin-top: 20px; margin-top: 20px;
.con_kuo{
.con_kuo {
position: relative; position: relative;
.con_img{
.con_img {
width: 192px; width: 192px;
height: 92px; height: 92px;
} }
.con_ico{
.con_ico {
position: absolute; position: absolute;
left: 25px; left: 25px;
top: 32px; top: 32px;
width: 31px; width: 31px;
height: 32px; height: 32px;
} }
.con_text{
.con_text {
position: absolute; position: absolute;
left: 66px; left: 66px;
top: 20px; top: 20px;

BIN
static/tabbar_icon/a-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
static/tabbar_icon/a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
static/tabbar_icon/b-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
static/tabbar_icon/b.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 827 B

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
static/tabbar_icon/c-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/tabbar_icon/c.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
static/tabbar_icon/d-2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
static/tabbar_icon/d-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
static/tabbar_icon/d.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
static/tabbar_icon/e-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
static/tabbar_icon/e.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB