diff --git a/App.vue b/App.vue
index 1f3bbeb..4996cd9 100644
--- a/App.vue
+++ b/App.vue
@@ -76,8 +76,15 @@
onLaunch: function(option) {
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid;
-
- this.$store.dispatch('INIT_CONFIG');
+ let appkey = uni.getStorage({
+ key: 'launchFlag'
+ })
+ if (appkey) {
+ setTimeout(() => {
+ this.$store.dispatch('INIT_CONFIG');
+ }, 6000)
+ }
+
// #ifdef APP-PLUS
//监听uni小程序发送的事件
@@ -204,10 +211,11 @@
- this.checknetwork()
+
},
onShow() {
+
let that = this
// 记录H5和公众号
if (this.$store.state.app.token) {
diff --git a/api/user.js b/api/user.js
index 7b806ed..1f1fce7 100644
--- a/api/user.js
+++ b/api/user.js
@@ -9,6 +9,14 @@
// +----------------------------------------------------------------------
import request from "@/utils/request.js";
import Cache from '@/utils/cache'
+/**
+ * 获取版本信息
+ */
+export function Appversion(data) {
+ return request.get(`app/version`, data, {
+ noAuth: true
+ });
+}
/**
* 提交提现
*/
diff --git a/config/app.js b/config/app.js
index f6c51a7..f083eab 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.json b/pages.json
index e80f645..397cbbd 100644
--- a/pages.json
+++ b/pages.json
@@ -225,8 +225,9 @@
}, {
"path": "goods_list/index",
"style": {
- "navigationBarTitleText": "里海云仓",
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+
}
},
{
@@ -303,8 +304,8 @@
}, {
"path": "cloud_entrepot/index",
"style": {
- "navigationBarTitleText": "里海云仓",
- "enablePullDownRefresh": false
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true
}
}, {
@@ -355,6 +356,14 @@
"navigationStyle": "custom"
}
+ }, {
+ "path": "tourism/indexa",
+ "style": {
+ "navigationBarTitleText": "特色文旅",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+
}
]
},
diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index 03783f3..86619ff 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -1,25 +1,29 @@
-
-
+
+
+
+
+
+
+
+
@@ -74,7 +85,9 @@
import eselect from '@/components/e-select/e-select.vue';
import {
supplychain,
- entrustchain
+ entrustchain,
+ editentrust,
+ entrustdetail
} from '@/api/sale.js'
export default {
components: {
@@ -85,8 +98,20 @@
return {
value1: 1,
value2: "",
- options1: [],
+ options1: [{
+ text: "Shenzhen1",
+ value: 1
+ }, {
+ text: "Shenzhen2",
+ value: 2
+ }, {
+
+
+ text: "Shenzhen3",
+ value: 3
+ }],
+ date: 1,
productList: [],
info: {
startDate: '',
@@ -97,14 +122,6 @@
selected: [],
showMonth: false
},
- formData: {
- entrust_mer_id: '',
- entrust_day: 0,
- is_type: "4",
- product_info: [],
- content: ''
- },
- type: ''
};
},
computed: {
@@ -114,39 +131,46 @@
onLoad(e) {
-
this.id = e.id;
this.type = e.type
if (this.type) {
-
uni.setNavigationBarTitle({
title: '编辑打折'
})
- } else {
-
+ this.editlist(e.id)
}
},
mounted() {
- this.list()
+ this.list()
},
methods: {
+ change1(item) {
+ console.log(item);
+ },
list() {
supplychain({
page: 1
}).then((res => {
-
+
for (let i in res.data.list) {
this.options1.push({
text: res.data.list[i].mer_name,
value: res.data.list[i].mer_id
})
}
-
// console.log(res)
}))
},
+ editlist(id) {
+ entrustdetail(id).then((res) => {
+ this.formData.entrust_mer_id = res.data.entrust_mer_id
+ this.formData.entrust_day = res.data.entrust_day
+ this.productList = res.data.product_list
+ this.getProduct(res.data.product_list)
+ })
+ },
calendar() {
@@ -162,11 +186,11 @@
},
//获取商品信息
getProduct(data) {
- console.log(data)
+ this.formData.product_info=[]
if (data.length > 0) {
-
+
for (let i in data) {
- this.formData.content+=data[i].store_name+','
+ this.formData.content += data[i].store_name + ','
this.formData.product_info.push({
product_attr_unique: data[i].product_attr_unique,
number: Number(data[i].number),
@@ -191,6 +215,38 @@
if (!value.entrust_mer_id) return that.$util.Tips({
title: '请添加商家'
});
+ this.type?
+ editentrust(this.id,value).then(res => {
+ if (res.status == '200') {
+ uni.hideLoading()
+ that.$util.Tips({
+ title: '编辑成功',
+ icon: 'success'
+ });
+ that.formData = {
+ entrust_mer_id: '',
+ entrust_day: 0,
+ is_type: "4",
+ product_info: []
+ }
+ uni.redirectTo({
+ url: '/pages/commissionedSales/initiateDelegation/index'
+ })
+
+ } else {
+ that.$util.Tips({
+ title: res.messge,
+ icon: 'success'
+ });
+ }
+ }).catch(err => {
+
+ return that.$util.Tips({
+ title: err
+ });
+ })
+
+ :
entrustchain(value).then(res => {
if (res.status == '200') {
uni.hideLoading()
@@ -207,7 +263,7 @@
uni.redirectTo({
url: '/pages/commissionedSales/initiateDelegation/index'
})
-
+
} else {
that.$util.Tips({
title: res.messge,
@@ -231,10 +287,6 @@
background: #F5F5F5;
}
- .content {
- height: 100vh;
- position: relative;
- }
.release_content {
@@ -479,10 +531,6 @@
}
.release_btn {
-
- position: absolute;
- bottom: 150rpx;
- left: 50%;
- margin-left: -347rpx;
+ margin-top: 100rpx;
}
\ No newline at end of file
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 3be7fef..05b293a 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -6,7 +6,8 @@
- 待处理
+
+ {{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
2020-07-07 14:14:14
@@ -14,55 +15,35 @@
-
+
-
+
- 良品铺子肉松饼1000g/箱 面...
+ {{item.store_name}}
- 委托价:¥34.90
+ 委托价:¥{{item.price}}
- 数量:100个
+ 数量:{{item.number}}个
-
-
-
-
-
-
-
- 良品铺子肉松饼1000g/箱 面...
-
-
-
- 委托价:¥34.90
-
-
- 数量:100个
-
-
-
-
-
委托方:
- 通滩镇镇街店铺
+ {{objinfo.mer_info.mer_name}}
@@ -70,7 +51,7 @@
被委托方:
- 通滩镇镇街店铺
+ {{objinfo.entrust_mer_info.mer_name}}
@@ -78,7 +59,7 @@
委托周期:
- 通滩镇镇街店铺
+ {{objinfo.entrust_day}}
@@ -86,7 +67,7 @@
结算周期:
- 通滩镇镇街店铺
+ {{objinfo.mer_info.settle_cycle}}
@@ -94,7 +75,7 @@
结算利息:
- 通滩镇镇街店铺
+ {{objinfo.mer_info.interest_rate}}%
@@ -102,7 +83,8 @@
状态:
- 通滩镇镇街店铺
+
+ {{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
@@ -110,15 +92,15 @@
是否结束委托:
- 通滩镇镇街店铺
+ {{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
-
+
拒绝原因:
- 通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺
+ {{objinfo.entrust_finish_refusal}}
@@ -130,36 +112,89 @@
-
+
-
+
- 良品铺子肉松饼1000g/箱 面包糕...
-
-
-
-
-
-
-
- 良品铺子肉松饼1000g/箱 面包糕...
+ {{item.store_name}}
+
-
+
+
+
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index bbc03ad..4615473 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -14,10 +14,10 @@
- {{item.title}}
+ {{item.content}}
- 委托周期:{{item.credit_buy}}
+ 委托周期:{{item.day}}
@@ -25,79 +25,84 @@
-
+
待处理
+
-
+
+
+ 编辑
删除
-
+
详情
-
+
+
+
已接受
+
结束委托
-
+
详情
-
+
+
+
已拒绝
-
+
删除
-
+
详情
+
+
已完成
-
+
删除
-
+
详情
-
-
-
-
-
- 新增委托
-
-
-
+
+
-
+
@@ -109,16 +114,19 @@
委托申请处理
- 结算周期: {{obj.settle_cycle}}天
+ 结算周期: 30天
+
+
- 利息比例: {{obj.interest_rate}}%
+ 利息比例: 0.05%
+
-
+
拒绝
-
+
接受
@@ -128,6 +136,7 @@
+
@@ -147,11 +156,15 @@
+
+
+
+
@@ -164,10 +177,13 @@
结算周期: 30天
+
+
利息比例: 0.05%
+
拒绝
@@ -195,15 +211,20 @@
结算周期: 30天
+
+
利息比例: 0.05%
+
拒绝原因：
+
+
@@ -221,43 +242,34 @@
\ No newline at end of file
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index d7a80d2..e8fbae7 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -74,9 +74,6 @@
-
- 发布
-
-->
@@ -223,7 +220,6 @@
this.backColor = 'rgba(252, 252, 252, 1)'
this.isFshow = true
-
}
},
@@ -309,7 +305,7 @@
},
// 编辑完成
editComfirm() {
- this.editFlag = false;
+this.editFlag = false;
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
},
getUniMp(appid) {
@@ -360,8 +356,10 @@
},
confirm(e) {
this.street = e.value[1].name
+
this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
})
this.showPicker = false
},
@@ -371,7 +369,7 @@
timeout: '10',
success: (res) => {
// console.log(res)
-
+ this.isshow = false
let latitude, longitude;
latitude = res.latitude.toString();
longitude = res.longitude.toString();
@@ -385,9 +383,11 @@
this.$nextTick(() => {
this.$bus.$emit('value-updated', this.street + ',' +
street_id);
+
})
}).catch(err => {
+ this.isshow = false
uni.showToast({
title: err,
icon: 'none'
@@ -395,12 +395,8 @@
})
},
fail: (err) => {
-
- uni.showToast({
- title: "获取定位超时",
- icon: 'none',
- duration: 2000
- });
+ this.isshow = false
+
}
});
},
diff --git a/pages/guide/guide.vue b/pages/guide/guide.vue
index fd35312..24e0323 100644
--- a/pages/guide/guide.vue
+++ b/pages/guide/guide.vue
@@ -1,13 +1,13 @@
-
-
-
+
+
+
-
+
@@ -16,16 +16,16 @@
-
+
- 跳过
+ {{num}}跳过
-
-
+
+
@@ -35,12 +35,11 @@
data() {
return {
//修改图片,文字描述
- imageList: [
- {
-
+ imageList: [{
+
src: '/static/images/guide.png'
}
-
+
],
indicatorDots: false,
autoplay: false,
@@ -49,7 +48,8 @@
iStatusBarHeight: '0px',
hpx: '100%',
cur: 0,
- dotsStyles: ''
+ dotsStyles: '',
+ num: 3
};
},
onLoad() {
@@ -64,29 +64,52 @@
onReady() {
// this.move(0, 1);
},
+ mounted() {
+
+this.countDown()
+
+ },
methods: {
+ countDown() {
+ let {
+ num
+ } = this;
+ if (num === 3) this.nums = true;
+ num = num > 0 ? num - 1 : "GO";
+ setTimeout(() => {
+ this.num = num;
+ if (num == 'GO') {
+ this.launchApp()
+ return
+ }
+ this.countDown();
+ }, 1000);
+
+
+ },
+
stopTouchMove: function() {
return false;
},
-
+
launchApp() {
-
+
//跳过引导页,储存本地值,下次进入直接跳过
uni.setStorage({
key: 'launchFlag',
data: true,
success() {
-
+
uni.switchTab({
- url:'/pages/index/index'
+ url: '/pages/index/index'
})
}
});
},
guideAction(event) {
- let that = this,
+ let that = this,
index = event.detail.current;
- that.cur = index;
+ that.cur = index;
// if (index == 0) {
// that.move(0, 1);
// that.moveTwo(150, 0.1);
@@ -216,7 +239,7 @@
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 57b6913..1b44c87 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -42,7 +42,7 @@
-
+
-
-
-
- 入库管理
-
-
-
- 商户设置
-
-
-
-
- 商品管理
-
-
-
-
- 提现管理
-
-
-
-
- 订单核销
-
-
-
-
-
-
-
-
-
-
-
- 我的店铺
-
-
-
- 供货采购
-
-
-
- 进货管理
-
-
-
-
- 扫码出库
-
-
+ @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
入库管理
+
+
+ 商户设置
+
+
+
+
+ 商品管理
+
提现管理
-
-
-
-
- 客服记录
-
订单核销
-
-
-
- 订单管理
-
-
-
-
- 商品管理
-
-
-
-
- 商户设置
-
-
-
-
- 交易大厅
-
-
委托销售
-
-
-
- 发布管理
-
-
-
-
+
+
委托订单
-
+ -->
+
+
+
+
+
+
+
+
+
+ 我的店铺
+
+
+
+
+ 供货采购
+
+
+
+ 进货管理
+
+
+
+
+ 扫码出库
+
+
+
+
+ 入库管理
+
+
+
+
+ 提现管理
+
+
+
+
+
+ 客服记录
+
+
+
+
+ 订单核销
+
+
+
+
+ 订单管理
+
+
+
+
+ 商品管理
+
+
+
+
+ 商户设置
+
+
+
+
+
+
+
-
-
-
-
-
-
- 里海云仓
-
-
-
- 供货采购
-
-
-
- 进货管理
-
-
-
-
- 扫码出库
-
-
-
-
- 入库管理
-
-
-
-
- 提现管理
-
+
+
+
+ 里海云仓
+
+
+
+ 供货采购
+
+
+
+ 进货管理
+
+
+
+
+ 扫码出库
+
+
+
+
+ 入库管理
+
+
+
+
+ 提现管理
+
-
-
-
- 客服记录
-
-
-
-
- 订单核销
-
-
-
-
- 订单管理
-
-
-
-
- 商品管理
-
-
-
-
- 商户设置
-
-
+
+
+
+
+
+ 我的店铺
+
+
+
+
+
+ 提现管理
+
+
+
+
+
+ 客服记录
+
+
+
+
+ 订单核销
+
+
+
+
+ 订单管理
+
+
+
+
+ 商品管理
+
+
+
+
+ 商户设置
+
+
+
+
+
+
+
+
-
-
+
+
我的店铺
-
-
-
- 提现管理
-
-
-
-
-
- 客服记录
-
-
-
-
- 订单核销
-
-
-
-
- 订单管理
-
-
-
-
- 商品管理
-
@@ -290,7 +328,6 @@
-
+
+
+
+
+
+
+
+
+
+
+ 通滩镇里海云仓
+
+
+
+
+ 全部
+
+
+
+
+
+
+
+
+
+
+
+
+ 供销综合云市场
+
+
+
+
+
+
+
+
+
+ 全部
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.tit}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.store_info}}
+
+
+
+ {{item.rate}}
+ {{item.reply_count}}评论
+
+
+
+
+ ￥{{item.price}}
+
+
+ ￥30.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{goodsNum}}
+
+
+
+
+ ￥{{totalMoney}}
+
+
+ 支持配送 售后无忧
+
+
+
+
+ 去结算
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 里海云仓
+
+
+
+
+
+
+
+ {{item.category_name}}云仓服务
+
+
+ {{item.description}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ .act {
+ color: #FF6D20;
+ }
+
+ .act_content {
+ width: 100vw;
+ // position: absolute;
+ // top: 965rpx;
+ z-index: 99;
+ background-color: #F4F4F4;
+ padding: 0 10rpx;
+
+ // transition: opt\ linear;
+ padding-top: 200rpx;
+ }
+
+ .act_class {
+ transition: 1s;
+ }
+
+ .act_class:active {
+ transform: scale(2);
+ // transform: translate(-500rpx, 500rpx);
+ }
+
+ .content_act {
+ width: 100vw;
+ position: absolute;
+ top: 165rpx;
+ z-index: 99;
+ background-color: #F4F4F4;
+ padding: 0 10rpx;
+ }
+ }
+
+ .fade-enter-active,
+ .fade-leave-active {
+ transition: opacity 0.5s;
+
+ }
+
+ .fade-enter,
+ .fade-leave-to {
+ opacity: 0;
+ }
+
+ .head_tits {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ box-sizing: border-box;
+ padding: 0 20rpx;
+ color: white;
+ }
+
+ .img_cls {
+ position: absolute;
+ top: 50%;
+ right: 7rpx;
+ transform: translateY(-50%);
+
+ }
+
+ .pop {
+ width: 615.07rpx;
+ padding: 30rpx 28rpx;
+
+ .pop_content {
+ width: 559rpx;
+ height: 80vh;
+ background-color: #F4F4F4;
+ padding: 28rpx;
+ border-radius: 21.03rpx 21.03rpx 0rpx 0rpx;
+ margin-top: 47rpx;
+
+ .pop_head {
+ // display: flex;
+ }
+
+ .pop_li {
+ display: flex;
+ margin-bottom: 52rpx;
+ }
+ }
+
+
+ }
+
+ .head_tit {
+ margin-left: 20rpx;
+ font-size: 40rpx;
+ // font-weight: 700;
+ transform: skewX(-10deg);
+ }
+
+
+ .act {
+ color: red;
+ }
+
+ .head {
+ position: absolute;
+ z-index: 100;
+ color: white;
+ display: flex;
+ justify-content: space-between;
+ width: 100%;
+ padding: 0 20rpx;
+ align-items: center;
+
+
+
+ }
+
+ .heads {
+ position: fixed;
+ z-index: 100;
+ color: white;
+ width: 100%;
+ padding: 0 20rpx;
+ // background-color: white;
+
+
+
+
+
+ }
+
+ .menu {
+ position: absolute;
+ top: 748rpx;
+ width: 750rpx;
+ background-color: rgba(255, 255, 255, 0.5);
+ // height: 175.23rpx;
+ // box-shadow: 0 0 100px 100px rgba(255, 255, 255, 0.5);
+ box-shadow: 0 0 100rpx 30rpx rgba(255, 255, 255, 0.9);
+
+ }
+
+ .goods_list {
+
+
+ .goods {
+ display: flex;
+ padding: 21rpx;
+ background-color: white;
+ border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+ margin-bottom: 20rpx;
+
+ .left {
+ width: 192.76rpx;
+ height: 192.76rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ margin-right: 21rpx;
+ }
+
+ .right {
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+
+ .tit {
+ font-size: 29.79rpx;
+ color: black;
+ font-weight: bold;
+
+ }
+
+ .good_score {
+ font-size: 26rpx;
+ color: #B3B3B3;
+ margin-bottom: 15rpx;
+ }
+
+ .good_price {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 60vw;
+
+ .good_price_l {
+ display: flex;
+
+ .old_price {
+ color: #B3B3B3;
+ text-decoration: line-through;
+ font-size: 26.29rpx;
+ margin-left: 15rpx;
+ }
+ }
+ }
+
+ }
+
+ // color: greenyellow;
+ }
+ }
+
+ .activeClass {
+ width: 400rpx;
+ height: 400rpx;
+ }
+
+ .act_swiper {
+ height: 150rpx;
+ position: fixed;
+ z-index: 99;
+ overflow: hidden;
+ }
+
+ // .act_swiper2 {
+ // height: 998rpx;
+ // }
+
+ .content_sift {
+ width: 730rpx;
+ padding: 22rpx 0;
+ display: flex;
+ justify-content: space-around;
+ background-color: white;
+ z-index: 99;
+ box-sizing: border-box;
+
+
+ }
+
+ .swipers {
+ width: 750rpx;
+ height: 998.83rpx;
+ }
+
+ .card {
+ width: 720rpx;
+ // margin:auto;
+ left: 50%;
+ transform: translateX(-50%);
+ position: fixed;
+ bottom: 0;
+ background-color: #333333;
+ height: 101.64rpx;
+ border-radius: 50.82rpx;
+ overflow: hidden;
+ color: white;
+ display: flex;
+ justify-content: space-between;
+ box-sizing: border-box;
+
+ .left {
+ display: flex;
+ align-items: center;
+ padding: 10rpx 35rpx;
+
+ .tot_price {
+ display: flex;
+ margin-left: 42rpx;
+ flex-direction: column;
+ justify-content: space-between;
+ }
+ }
+
+ .right {
+ font-size: 33.29rpx;
+ line-height: 50px;
+ background: linear-gradient(to right, #F84221, #FF6D20);
+ width: 175.23rpx;
+ text-align: center;
+ }
+ }
+
+ .badge {
+ position: absolute;
+ top: 0;
+ right: 0;
+ background-color: red;
+ transform: translate(50%, -50%);
+ padding: 0 10rpx;
+ border-radius: 30rpx;
+ }
+
+ .cloud_entrepot {
+ background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
+ background-size: cover;
+ padding-bottom: 92.98rpx;
+ }
+
+ .head-wrapper {
+ height: 485.96rpx;
+ width: 100%;
+ background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/top.png") no-repeat;
+ background-size: cover;
+ margin-bottom: 49.12rpx;
+ }
+
+ .town-title {
+ margin: 0 auto;
+ width: 100%;
+ text-align: center;
+ font-size: 50.88rpx;
+ color: #fff;
+ margin-bottom: 28.07rpx;
+
+ &::after {
+ content: '';
+ display: inline-block;
+ width: 66.67rpx;
+ height: 31.58rpx;
+ background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/you.png") no-repeat;
+ background-size: cover;
+ margin-left: 24.56rpx;
+ }
+
+ &::before {
+ content: '';
+ display: inline-block;
+ width: 66.67rpx;
+ height: 31.58rpx;
+ background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/zuo.png") no-repeat;
+ background-size: cover;
+ margin-right: 24.56rpx;
+ }
+ }
+
+ .body-wrapper {
+ width: 694.74rpx;
+ display: flex;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ margin: 0 auto;
+
+ .item {
+ width: 336.84rpx;
+ height: 100%;
+ padding: 24.56rpx 28.07rpx;
+ margin-bottom: 21.05rpx;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ box-sizing: border-box;
+
+ text {
+ display: block;
+ font-size: 24.56rpx;
+ color: #999;
+ margin-bottom: 14.04rpx;
+ }
+
+ .item-title {
+ font-size: 31.58rpx;
+ color: #333;
+ }
+
+ .chakan-btn {
+ width: 114.04rpx;
+ height: 49.12rpx;
+ font-size: 28.07rpx;
+ text-align: center;
+ line-height: 49.12rpx;
+ color: #fff;
+ margin-top: auto;
+ background: linear-gradient(90deg, #FE5300 0%, #F84221 100%);
+ border-radius: 50px;
+ }
+ }
+ }
+
+ .empty {
+ // display: flex;
+ // justify-content: space-between;
+ // flex-direction: column;
+ // align-items: center;
+ // padding: 20vh 0;
+ position: relative;
+ height: 85vh;
+
+ .info {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+
+ // padding-top: 100px;
+ }
+
+ .head_r {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ }
+
\ No newline at end of file
diff --git a/pages/nongKe/food/indexa.vue b/pages/nongKe/food/indexa.vue
index 03faba3..5e3d3cd 100644
--- a/pages/nongKe/food/indexa.vue
+++ b/pages/nongKe/food/indexa.vue
@@ -40,91 +40,90 @@
+
+
+
+
+
-
-
-
-
-
-
-
-
- 特产
- {{item.mer_name}}
- {{item.type_name}}
-
-
-
- 5.0
- 月销2000+
- 20分钟
- 1.1km
-
-
-
- {{item.service_phone}}
-
-
-
- {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
-
-
-
- {{item.mer_address}}
-
-
-
-
-
-
-
- 笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
-
-
- $10.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 全部美食
+
+
+ 附近
+
+
+ 智能排序
+
+
+ 筛选
-
-
-
+
+
+ 泸州万达
+
+
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+ {{item.type_name}}
+
+
+
+ 5.0
+ ￥80/人
+ 20分钟
+ 1.1km
+
+
+
+
+ {{item.service_phone}}
+
+
+
+ {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+
+
+
+ {{item.mer_address}}
+
+
+
+
+ 惠
+ ￥100
+ 6.9折
+ ￥100
+ 究极套餐
+
+
+
+
+
+
+
@@ -138,7 +137,14 @@
keyword: "",
list: [1, 1, 1, 11, 1, 11, 11],
lists: [1, 1, 1, 1, 1],
- storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
+ storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+ list1: [{
+ name: "美食餐厅"
+ }, {
+ name: "聚餐宴请"
+ }, {
+ name: "单人餐"
+ }, ]
}
},
onLaunch() {
@@ -199,6 +205,10 @@
.foodType {
display: flex;
+ justify-content: space-around;
+ background-color: #fff;
+ padding: 21rpx 38rpx;
+ border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
.foodLi {}
}
@@ -232,7 +242,18 @@
}
}
+ .hot_serch {
+ margin: 20rpx;
+
+ .hot_serch_li {
+ background-color: white;
+ padding: 8rpx 22rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ }
+ }
+
.store {
+
.goods_list {
margin-top: 20rpx;
@@ -303,6 +324,41 @@
margin: 0 10rpx 0;
}
}
+
+ .package {
+ margin-top: 30rpx;
+ align-items: center;
+
+ .hui {
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ background-color: #FEEBE7;
+ color: #F84221;
+ font-size: 22.78rpx;
+ // padding: 5rpx;
+ width: 36rpx;
+ height: 35rpx;
+ text-align: center;
+
+ }
+
+ .price {
+ color: #F84221;
+ font-size: 36.8rpx;
+ font-weight: bold;
+ }
+
+ .sale {
+ width: 77.1rpx;
+ height: 44rpx;
+ background-color: white;
+ color: #F84221;
+ border: 1px solid #F84221;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ font-size: 22.78rpx;
+ text-align: center;
+ line-height: 40rpx;
+ }
+ }
}
}
}
@@ -323,4 +379,9 @@
transform: translateY(-50%);
}
+
+ .display_around {
+ display: flex;
+ justify-content: space-around;
+ }
\ No newline at end of file
diff --git a/pages/nongKe/goods_list/index.vue b/pages/nongKe/goods_list/index.vue
index 62b4c50..29b320f 100644
--- a/pages/nongKe/goods_list/index.vue
+++ b/pages/nongKe/goods_list/index.vue
@@ -335,6 +335,8 @@
},
// 去详情页
godDetail(item) {
+ console.log(452)
+ return
goShopDetail(item, this.uid).then(res => {
if (this.isLogin) {
initiateAssistApi(item.activity_id).then(res => {
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 6921a8f..8e24527 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -20,9 +20,6 @@
-
+
+
+
+
+
+
+
+
+ 特色文旅
+
+
+
+ 江阳区
+
+ 晴天30℃
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 热门景点
+
+
+
+
+
+
+
+
+
+
+ sdsd
+
+
+ sdssds
+
+
+
+
+ sdsd
+
+
+
+ asdsadasdsd
+
+
+
+
+
+
+
+
+
+ 趣玩榜
+
+
+
+
+ 3.5万人游玩过
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+ AAAA
+
+
+
+ 5.0
+ 2000条评论
+
+
+
+
+ 距离你6.8KM
+ 江阳区
+
+
+
+ 公园
+ 绿化
+
+
+ 免费预约
+
+
+
+ 必玩
+ 张家大叔、卧龙树、京杭太
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 07d8dc4..d04eb0f 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -8,8 +8,9 @@
购物数量 {{cartTotalCount}}
- {{ footerswitch ? '管理' : '取消'}}
+ {{ footerswitch ? '管理' : '取消'}}
+
@@ -20,31 +21,38 @@
-
+
{{item.mer_name}}
优惠券
-
+
-
+
+
{{goods.product.store_name}}
-
+
{{goods.productAttr.sku}}
-
- {{goods.product.once_min_count}}件起购，最多{{goods.product.once_max_count}}件
+
+ {{goods.product.once_min_count}}件起购，最多{{goods.product.once_max_count}}件
￥{{goods.productAttr.price}}
@@ -54,9 +62,11 @@
- -
+
+ -
{{goods.cart_num}}
- +
+ +
+
@@ -64,15 +74,18 @@
- 失效商品
+ 失效商品
清空
-
+
失效
-
+
+
@@ -88,17 +101,20 @@
-
+
暂无商品，去添加点什么吧
-
+
-
+
{{loadTitle}}
-