diff --git a/App.vue b/App.vue
index 09c5f38..e273265 100644
--- a/App.vue
+++ b/App.vue
@@ -85,7 +85,6 @@
}, 6000)
}
-
// #ifdef APP-PLUS
//初始化uniMP小程序发送的事件以及其他操作
initEvent();
@@ -156,7 +155,7 @@
that.getConfigData()
//#ifdef APP-PLUS
- this.checknetwork()
+ this.checknetwork()
jpushModule.setLoggerEnable(true);
jpushModule.initJPushService()
@@ -222,7 +221,7 @@
},
onShow() {
-
+
let that = this
// 记录H5和公众号
if (this.$store.state.app.token) {
@@ -251,7 +250,7 @@
// #endif
},
mounted() {
-
+
},
methods: {
@@ -261,11 +260,11 @@
uni.onNetworkStatusChange(function(res) {
if (res.isConnected) {
-
+
uni.reLaunch({
url: '/pages/index/index'
})
-
+
} else {
uni.showModal({
diff --git a/api/product.js b/api/product.js
index 547c66e..8bfa886 100644
--- a/api/product.js
+++ b/api/product.js
@@ -17,14 +17,14 @@ export const getProductDetailsAPI = (data) => request.get('micro/product_details
/**
*商品列表
*/
-export const spuInfo = (id,data) => request.get('product/spu/street/'+id, data)
+export const spuInfo = (id, data) => request.get('product/spu/street/' + id, data)
/**
* 线下导入
*/
-export function postImport(merid,data) {
- return request.post(`server/${merid}/product/stockIn`, data);
+export function postImport(merid, data) {
+ return request.post(`server/${merid}/product/stockIn`, data);
}
/**
* 获取商户基本信息 http://127.0.0.1:8324/api/store/merchant/info?id=4
@@ -38,20 +38,26 @@ export const merchantUpdateAPI = (data) => request.post('store/merchant/update',
* 商品列表
*/
export function productLstApi(merId, data) {
- return request.get(`server/${merId}/product/lst`, data, { login: true });
+ return request.get(`server/${merId}/product/lst`, data, {
+ login: true
+ });
}
/**
* 商品列表 -- 删除
*/
export function productDeleteApi(merId, id) {
- return request.post(`server/${merId}/product/delete/${id}`, {}, { login: true });
+ return request.post(`server/${merId}/product/delete/${id}`, {}, {
+ login: true
+ });
}
/**
* 商品列表 -- 上下架
*/
export function productOffApi(merId, id, data) {
- return request.post(`server/${merId}/product/status/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/status/${id}`, data, {
+ login: true
+ });
}
/*
@@ -59,7 +65,9 @@ export function productOffApi(merId, id, data) {
*/
export function productTitle(merId, data) {
- return request.get(`server/${merId}/product/title`, data, { login: true });
+ return request.get(`server/${merId}/product/title`, data, {
+ login: true
+ });
}
/*
@@ -67,7 +75,9 @@ export function productTitle(merId, data) {
*/
export function productDestory(merId, id, data) {
- return request.post(`server/${merId}/product/destory/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/destory/${id}`, data, {
+ login: true
+ });
}
/*
@@ -75,7 +85,9 @@ export function productDestory(merId, id, data) {
*/
export function productRestore(merId, id) {
- return request.post(`server/${merId}/product/restore/${id}`, {}, { login: true });
+ return request.post(`server/${merId}/product/restore/${id}`, {}, {
+ login: true
+ });
}
/*
@@ -83,7 +95,9 @@ export function productRestore(merId, id) {
*/
export function categoryBrandlist(merId) {
- return request.get(`server/${merId}/category/brandlist`, {}, { login: true });
+ return request.get(`server/${merId}/category/brandlist`, {}, {
+ login: true
+ });
}
/*
@@ -91,7 +105,9 @@ export function categoryBrandlist(merId) {
*/
export function categorySelect(merId) {
- return request.get(`server/${merId}/category/select`, {}, { login: true })
+ return request.get(`server/${merId}/category/select`, {}, {
+ login: true
+ })
}
/*
@@ -99,7 +115,9 @@ export function categorySelect(merId) {
*/
export function categoryList(merId) {
- return request.get(`server/${merId}/category/list`, {}, { login: true })
+ return request.get(`server/${merId}/category/list`, {}, {
+ login: true
+ })
}
/*
@@ -107,13 +125,17 @@ export function categoryList(merId) {
*/
export function productCreate(merId, data) {
- return request.post(`server/${merId}/product/create`, data, { login: true })
+ return request.post(`server/${merId}/product/create`, data, {
+ login: true
+ })
}
/**
* 商品列表 -- 设置推荐
*/
export function productRecommendApi(merId, id, data) {
- return request.post(`server/${merId}/product/good/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/good/${id}`, data, {
+ login: true
+ });
}
/*
@@ -121,119 +143,181 @@ export function productRecommendApi(merId, id, data) {
*/
export function attrList(merId, data) {
- return request.get(`server/${merId}/attr/lst`, data, { login: true })
+ return request.get(`server/${merId}/attr/lst`, data, {
+ login: true
+ })
}
/*
请求运费模板
*/
export function templateList(merId, data) {
- return request.get(`server/${merId}/template/lst`, data, { login: true })
+ return request.get(`server/${merId}/template/lst`, data, {
+ login: true
+ })
}
/*
运费模板 -- 删除
*/
export function templateDelete(merId, data) {
- return request.post(`server/${merId}/template/delete`, data, { login: true })
+ return request.post(`server/${merId}/template/delete`, data, {
+ login: true
+ })
}
/**
* 运费模板 -- 详情
*/
export function templateDetail(merId, id) {
- return request.get(`server/${merId}/template/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/template/detail/${id}`, {}, {
+ login: true
+ });
}
/*
运费模板 -- 添加
*/
export function templateCreate(merId, data) {
- return request.post(`server/${merId}/template/create`, data, { login: true });
+ return request.post(`server/${merId}/template/create`, data, {
+ login: true
+ });
}
/*
运费模板 -- 编辑
*/
export function templateUpdate(merId, id, data) {
- return request.post(`server/${merId}/template/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/template/update/${id}`, data, {
+ login: true
+ });
}
/**
* 店铺分类 -- 列表
*/
export function storeClassifyLst(merId) {
- return request.get(`server/${merId}/category/lst`, {}, { login: true });
+ return request.get(`server/${merId}/category/lst`, {}, {
+ login: true
+ });
}
/**
* 店铺分类 -- 列表(删除)
*/
export function storeClassifyDel(merId, id) {
- return request.post(`server/${merId}/category/delete/${id}`, {}, { login: true });
+ return request.post(`server/${merId}/category/delete/${id}`, {}, {
+ login: true
+ });
}
/**
* 上级分类 -- 商户列表
*/
export function merClassifyLst(merId) {
- return request.get(`server/${merId}/category/select`, {}, { login: true });
+ return request.get(`server/${merId}/category/select`, {}, {
+ login: true
+ });
}
/**
* 店铺分类 -- 添加
*/
export function merClassifyAdd(merId, data) {
- return request.post(`server/${merId}/category/create`, data, { login: true });
+ return request.post(`server/${merId}/category/create`, data, {
+ login: true
+ });
}
/**
* 店铺分类 -- 详情
*/
export function merClassifyDetail(merId, id) {
- return request.get(`server/${merId}/category/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/category/detail/${id}`, {}, {
+ login: true
+ });
}
/**
* 店铺分类 -- 编辑
*/
export function merClassifyUpdate(merId, id, data) {
- return request.post(`server/${merId}/category/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/category/update/${id}`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 列表
*/
export function specificationLst(merId, data) {
- return request.get(`server/${merId}/attr/lst`, data, { login: true });
+ return request.get(`server/${merId}/attr/lst`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 删除
*/
export function specificationDel(merId, data) {
- return request.post(`server/${merId}/attr/delete`, data, { login: true });
+ return request.post(`server/${merId}/attr/delete`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 添加
*/
export function specificationAdd(merId, data) {
- return request.post(`server/${merId}/attr/create`, data, { login: true });
+ return request.post(`server/${merId}/attr/create`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 编辑
*/
export function specificationUpdate(merId, id, data) {
- return request.post(`server/${merId}/attr/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/attr/update/${id}`, data, {
+ login: true
+ });
}
/**
* 商品规格项目 -- 详情
*/
export function specificationDetail(merId, id) {
- return request.get(`server/${merId}/attr/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/attr/detail/${id}`, {}, {
+ login: true
+ });
}
/*
请求商品详情
*/
export function productDetail(merId, id) {
- return request.get(`server/${merId}/product/detail/${id}`, {}, { login: true });
+ return request.get(`server/${merId}/product/detail/${id}`, {}, {
+ login: true
+ });
}
/*
编辑商品
*/
export function productUpdate(merId, id, data) {
- return request.post(`server/${merId}/product/update/${id}`, data, { login: true });
+ return request.post(`server/${merId}/product/update/${id}`, data, {
+ login: true
+ });
}
/*
添加商品 -- 获取送货方式信息
*/
export function getDeliveryType(merId) {
- return request.get(`server/${merId}/product/config`, {}, { login: true });
+ return request.get(`server/${merId}/product/config`, {}, {
+ login: true
+ });
+}
+
+/*
+ 商品 -- 获取交易协议内容
+*/
+export function business() {
+ return request.get(`business/agree?type=business_apply_agree`, {}, {
+ noAuth: true
+ });
+}
+/*
+ 商品 -- 获取交易申请记录
+*/
+export function intention(data) {
+ return request.get(`intention/lst`, data);
+}
+
+/*
+ 商品 -- 同意提交申请
+*/
+export function intentionbus(data) {
+ return request.post(`intention/business`, {});
}
\ No newline at end of file
diff --git a/api/store.js b/api/store.js
index 1b566c2..399e35a 100644
--- a/api/store.js
+++ b/api/store.js
@@ -572,4 +572,11 @@ export function supAgoodsApi(data) {
// }
export function vicinityStoreApi(data) {
return request.get(`region/${data}/merchant`);
+}
+
+/*
+ 商家入驻 -- 获取商户入驻申请协议内容
+*/
+export function agreeiness() {
+ return request.get(`business/agree?type=sys_intention_agree`, {}, { noAuth: true });
}
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index 1f1fce7..0009c40 100644
--- a/api/user.js
+++ b/api/user.js
@@ -719,4 +719,5 @@ export function getBankInfo() {
// 商户账单管理
export function getBillDetil() {
return request.get(`mer/financial_record`)
-}
\ No newline at end of file
+}
+
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index 1b8648d..341bacb 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -65,14 +65,14 @@
type: Boolean,
default: false
},
- location_Arr: {
- type: Object,
- default: () => ({})
- },
- town: {
- type: String,
- default: false
- },
+ // location_Arr: {
+ // type: Object,
+ // default: () => ({})
+ // },
+ // town: {
+ // type: String,
+ // default: false
+ // },
},
data() {
diff --git a/config/app.js b/config/app.js
index 5261574..8597d11 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
- httpApi = 'https://shop.lihaink.cn' // 生产
- // httpApi = "https://crmeb-test.shop.lihaink.cn"
+ // httpApi = 'https://shop.lihaink.cn' // 生产
+ httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325'
@@ -22,10 +22,11 @@ if (process.env.NODE_ENV === "development") {
// httpApiTwo = "baseUrl" // h5跨域配置
httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
// httpApiThree = 'baseUrlTest' // h5跨域配置
+
// #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 b571c8e..d51d063 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
- "versionName" : "1.3.8",
- "versionCode" : 138,
+ "versionName" : "1.4.1",
+ "versionCode" : 141,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index dfca1ac..a5b41ca 100644
--- a/pages.json
+++ b/pages.json
@@ -128,26 +128,25 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "uni_modules/guyue-updater/pages/updater",
+ "style": {
+ "app-plus": {
+ "animationDuration": 200,
+ "animationType": "fade-in",
+ "background": "transparent",
+ "backgroundColorTop": "transparent",
+ "bounce": "none",
+ "popGesture": "none",
+ "scrollIndicator": false,
+ "titleNView": false
+ },
+ "backgroundColor": "transparent",
+ "disableScroll": true,
+ "navigationStyle": "custom"
+ }
}
- ,{
- "path": "uni_modules/guyue-updater/pages/updater",
- "style": {
- "app-plus": {
- "animationDuration": 200,
- "animationType": "fade-in",
- "background": "transparent",
- "backgroundColorTop": "transparent",
- "bounce": "none",
- "popGesture": "none",
- "scrollIndicator": false,
- "titleNView": false
- },
- "backgroundColor": "transparent",
- "disableScroll": true,
- "navigationStyle": "custom"
- }
-}
-],
+ ],
"subPackages": [{
"root": "pages/goods_cate",
"name": "goods_cate",
@@ -1123,6 +1122,18 @@
"navigationBarTitleText": "商品管理",
"enablePullDownRefresh": true
}
+ },{
+ "path": "transactionApplication/index",
+ "style": {
+ "navigationBarTitleText": "交易申请",
+ "enablePullDownRefresh": false
+ }
+ },{
+ "path": "transactionApplication/application",
+ "style": {
+ "navigationBarTitleText": "申请记录",
+ "enablePullDownRefresh": false
+ }
},
{
"path": "goodsOnSale/index",
@@ -1625,7 +1636,7 @@
"iconPath": "static/tabbar_icon/c.png",
"selectedIconPath": "static/tabbar_icon/c-a.png",
"text": "发布"
-
+
},
{
"pagePath": "pages/supply_chains/supply_chains",
@@ -1641,7 +1652,7 @@
"text": "我的"
}
]
-
+
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index f5c2e4d..bb740c1 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -30,7 +30,7 @@
-
+
@@ -73,9 +73,7 @@
-
-
-
+
-
+
@@ -350,15 +375,12 @@
import emptyPage from '@/components/emptyPage.vue';
import zbpSwiper from '@/components/zbpSwiper'
import {
- mapState,
+
mapGetters
} from 'vuex'
+
import {
- getWorkArticleCount,
- getSlideAPI
- } from '@/api/article.js'
- import {
- getStoreList,
+
getUserInfo
} from '@/api/user.js'
import {
@@ -398,7 +420,7 @@
};
},
computed: {
- ...mapGetters(['userInfo', 'location', 'isLogin'])
+ ...mapGetters(['userInfo', 'isLogin'])
},
created() {},
onLoad() {},
@@ -411,98 +433,14 @@
this.jurisdiction = true
}
this.getUserInfo()
- this.appLocation()
- },
- onPullDownRefresh() {
- this.getUserInfo()
- uni.stopPullDownRefresh()
- },
- mounted() {
- this.appLocation()
-
+
},
+
+
methods: {
-
-
- appLocation() {
- uni.getLocation({
- type: 'wgs84',
- timeout: '10',
- success: (res) => {
- // console.log(res)
-
- let latitude, longitude;
- latitude = res.latitude.toString();
- longitude = res.longitude.toString();
- getGeocoder({
- lat: latitude,
- long: longitude
- }).then(res => {
- this.street = res.data.address_component.street
- Cache.set('ADRESS_LOCATION', this.street)
- }).catch(err => {
- uni.showToast({
- title: err,
- icon: 'none'
- })
- })
- },
- fail: (err) => {
-
- uni.showToast({
- title: "获取定位超时",
- icon: 'none',
- duration: 2000
- });
- }
- });
- },
-
- scrolling() {
- // 滚动条距文档顶部的距离
- let scrollTop =
- window.pageYOffset ||
- document.documentElement.scrollTop ||
- document.body.scrollTop;
- // 滚动条滚动的距离
- let scrollStep = scrollTop - this.oldScrollTop;
- console.log("header 滚动距离 ", scrollTop);
- // 更新——滚动前，滚动条距文档顶部的距离
- this.oldScrollTop = scrollTop;
-
- //变量windowHeight是可视区的高度
- let windowHeight =
- document.documentElement.clientHeight || document.body.clientHeight;
- //变量scrollHeight是滚动条的总高度
- let scrollHeight =
- document.documentElement.scrollHeight || document.body.scrollHeight;
-
- //滚动条到底部的条件
- if (scrollTop + windowHeight == scrollHeight) {
- //你想做的事情
- console.log("header 你已经到底部了");
- }
- if (scrollStep < 0) {
- this.isFshow = false
- console.log("header 滚动条向上滚动了！");
- } else {
- this.isFshow = true
- console.log("header 滚动条向下滚动了！");
- }
- // 判断是否到了最顶部
- if (scrollTop <= 0) {
- this.isFshow = false
- console.log("header 到了最顶部")
- }
- },
-
- kkchange(e) {
- this.bgColor = e
- },
-
navigator(url, t) {
- // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
+
uni.navigateTo({
url: url
})
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 5793877..d51d48d 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -16,28 +16,61 @@
-->
-
-
+
-
-
-
-
-
-
- {{town}}里海云仓
+
+
+
+
+
+
+ {{town}}里海云仓
+
+
+
+
+
+
+
+
+ {{street}}
+
+
+
+
+ 全部
+
+
+
+
+
+
+
+
+
+
+ 供销综合云市场
+
+
+ 供销综合云商品
+
-
-
- 全部
-
-
-
+
+
+
+
+
@@ -54,7 +87,7 @@
-
@@ -67,8 +100,8 @@
-
-
+
+
-
+
-
-
-
-
- {{item.tit}}
-
-
-
-
+
+
+
+ {{item.tit}}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{item.store_info}}
-
-
-
- {{item.rate}}
- {{item.reply_count}}评论
-
-
-
-
- ￥{{item.price}}
-
-
- ￥30.00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
- 暂无商品
-
-
-
-
-
-
+
-
-
-
-
- {{goodsNum}}
-
-
-
-
- ￥{{totalMoney}}
-
-
- 支持配送 售后无忧
-
-
+
- 去结算
+
+
+ {{item.store_info}}
+
+
+
+ {{item.rate}}
+ {{item.reply_count}}评论
+
+
+
+
+ ￥{{item.price}}
+
+
+ ￥30.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无商品
+
-
+
+
+
+
+
+
+
+ {{goodsNum}}
+
+
+
+
+ ￥{{totalMoney}}
+
+
+ 支持配送 售后无忧
+
+
+
+
+ 去结算
+
+
+
+
-
-
-
-
-
-
-
- 里海云仓
+
+
+
+
+
+
+
+ 里海云仓
+
-
-
-
-
-
-
- {{item.category_name}}云仓服务
-
-
- {{item.description}}
+
+
+
+
+
+ {{item.category_name}}云仓服务
+
+
+ {{item.description}}
+
+
+
+
+
+
+
+
+
+ 当前区域暂无云仓
+
+
+
+
-
+
+
+
-
+
-
-
-
-
-
- 当前区域暂无云仓
+
+
+
+ 当前区域暂无云仓
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
@@ -282,8 +333,6 @@
-
-
尺码
@@ -292,7 +341,6 @@
{{item.sku}}
-
@@ -304,9 +352,7 @@
-
确定
-
@@ -314,19 +360,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -350,13 +383,27 @@
import {
goShopDetail
} from '@/libs/order.js'
+ // 7200 = 8 = 80000 8616
import {
postCartAdd,
} from '@/api/store.js';
import authorize from '@/components/Authorize';
+
+ import {
+ getArea,
+ getStreet
+ } from '@/api/article.js';
+ import {
+ getIndexData,
+ getDiy
+ } from '@/api/api.js'
+ import {
+ getGeocoder
+ } from '@/api/store.js';
import {
mapGetters
- } from "vuex";
+ } from 'vuex'
+ import Cache from '@/utils/cache';
export default {
components: {
authorize,
@@ -364,10 +411,10 @@
data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return {
- skuform: {
-
-
- },
+ skuform: {},
+ defaInd: [0, 0],
+ showPicker: false,
+ columnData: [],
skusize: 0,
skuNumber: 1,
showcartpop: false,
@@ -383,10 +430,12 @@
isEmpty: false,
winHeight: 0,
cloudList: [],
+ street: '',
street_code: '',
totalMoney: 0,
town: '',
list: [1, 1, 1, 1, 1],
+ showSelect: false,
showPop: false,
keyword: "",
showLoading: false,
@@ -430,10 +479,40 @@
this.street_code = e.street
this.town = e.town
this.getCloundShop()
+ this.street = e.town
+ this.Area()
+ let that = this
+ setTimeout(() => {
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.flags')
+ .boundingClientRect(rect => {
+ that.headtop = rect.top
+ })
+ .exec();
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.flags')
+ .boundingClientRect(rect => {
+ this.headtop = rect.top
+ })
+ .exec();
+ uni.createSelectorQuery()
+ .in(this)
+ .select('.cart')
+ .boundingClientRect(rect => {
+ // console.log(this.cartTagInfo, 6666)
+ this.cartTagInfo = rect
+ })
+ .exec();
+ // console.log(that.headtop)
+ }, 500)
+
// console.log(this.appInfo, "手机信息")
},
onShow() {
this.cartFn()
+ this.showSelect = false
},
// 分页
onReachBottom() {
@@ -443,7 +522,7 @@
this.flag = true
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id,
+ category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
@@ -472,8 +551,6 @@
// }
// })
},
-
-
onPageScroll(e) {
let that = this
this.showtit = !Boolean(e.scrollTop)
@@ -494,22 +571,6 @@
}
})
.exec();
- if (this.headtop) return
- uni.createSelectorQuery()
- .in(this)
- .select('.flags')
- .boundingClientRect(rect => {
- this.headtop = rect.top
- })
- .exec();
- uni.createSelectorQuery()
- .in(this)
- .select('.cart')
- .boundingClientRect(rect => {
- this.cartTagInfo = rect
- })
- .exec();
-
},
onPullDownRefresh() {
this.getCloundShop()
@@ -517,11 +578,94 @@
this.cartFn()
uni.stopPullDownRefresh()
},
- // onReachBottom() {
- // console.log("daidi")
-
- // },
methods: {
+ showpick() {
+ this.showPicker = !this.showPicker
+
+
+ },
+ swiperClick(item) {
+ const url = item.info[1].value
+ uni.navigateTo({
+ url: url
+ })
+ },
+ selectLocation() {
+ this.isSelectPlace ? this.showPicker = true : ''
+
+ },
+
+ confirm(e) {
+ this.showPicker = false
+ this.$emit('selectPlce', e)
+ this.$emit('change', e)
+ this.street = e.value[1].name
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+ })
+
+ // this.sotreParam.street_id = e.value[1].code
+ this.street_code = e.value[1].code
+ this.getCloundShop()
+ this.town = e.value[1].name
+ // this.storeMerchantList()
+
+ },
+ changeHandler(e) {
+ const {
+ columnIndex,
+ value,
+ values,
+ index,
+ picker = this.$refs.uPicker
+ } = e;
+ if (columnIndex === 0) {
+ getStreet({
+ area_code: value[0]['code']
+ }).then(res => {
+ picker.setColumnValues(1, res.data);
+ });
+ }
+ },
+ Area() {
+ let that = this
+ getArea({
+ city_code: 510500
+ }).then(res => {
+
+ this.$refs.uPicker.setColumnValues(0, res.data);
+ this.Street(res.data[0]['code']);
+ // console.log(res.data, 66666)
+ });
+ },
+ Street(code) {
+ getStreet({
+ area_code: code
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(1, res.data);
+
+ });
+ },
+
+ swiperChange(e) {
+ let {
+ current,
+ source
+ } = e.detail;
+ if (source === 'autoplay' || source === 'touch') {
+ this.bgColor = this.swiper.url[e.detail.current]['img']
+ this.$emit('kkchange', this.bgColor)
+ }
+ },
+
+
+ // 对象转数组
+ objToArr(data) {
+ let obj = Object.keys(data).sort();
+ let m = obj.map(key => data[key]);
+ return m;
+ },
skusizechange(i) {
this.skusize = i
@@ -554,9 +698,8 @@
},
valChange(e) {
- console.log(e.value)
this.skuNumber = e.value
- // this.valChange = e.value
+
},
closecartpop() {
this.showcartpop = false
@@ -578,7 +721,7 @@
},
cartFn() {
getCartList().then(res => {
- console.log(res)
+ // console.log(res)
this.totalMoney = 0
this.cartList = res.data.list
this.cartList.forEach(e => {
@@ -594,7 +737,7 @@
this.goodsNum = res.data[0].count
})
},
- godDetail(item) {
+ goodDetail(item) {
goShopDetail(item, this.uid).then(res => {
if (this.isLogin) {
initiateAssistApi(item.activity_id).then(res => {
@@ -617,7 +760,6 @@
})
},
serch() {
- // console.log(this.keyword)
this.getList()
},
goBack() {
@@ -648,7 +790,7 @@
this.status = "loading"
cloudWarehouse({
street_code: this.street_code,
- category_id: this.cloudList[this.current].category_id,
+ category_id: this.cloudList[this.current]?.category_id || "",
order: this.type,
keyword: this.keyword,
page_num: this.page_num
@@ -666,14 +808,12 @@
},
addcart(item, i) {
-
- // 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,
@@ -683,14 +823,11 @@
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
@@ -710,7 +847,6 @@
})
}).catch(err => {
- // this.act_cart = false
uni.showToast({
title: err,
icon: "none",
@@ -725,11 +861,8 @@
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)
+
}
return
@@ -758,6 +891,7 @@
street_code: this.street_code,
category_id: this.cloudList[this.current].category_id
}).then(res => {
+ this.trnList = []
this.goodsList = res.data.list
this.goodsList.forEach(item => {
this.trnList.push({
@@ -766,8 +900,6 @@
})
})
})
- // console.log(this.cloudList)
- data.length < 1 ? Toast("暂无云仓") : '';
}
}
}
@@ -786,6 +918,39 @@
}
}
+ .selected-list {
+ padding: 24rpx 14rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ background-color: #fff;
+ position: absolute;
+ left: 100rpx;
+ font-size: 29.79rpx;
+ z-index: 9999;
+ // top: 100rpx;
+ opacity: 0;
+ transition: 0.5s;
+
+
+
+ .triangle-up {
+ width: 0;
+ height: 0;
+ border-left: 10rpx solid transparent;
+ border-right: 10rpx solid transparent;
+ border-bottom: 10rpx solid white;
+ position: absolute;
+ top: -10rpx;
+ }
+
+ .selected-li {
+ margin-top: 35rpx;
+ color: #F84221;
+ display: flex;
+ align-items: center;
+ }
+ }
+
+
.sku {
padding: 20rpx;
@@ -1018,8 +1183,15 @@
.head_tit {
margin-left: 20rpx;
font-size: 40rpx;
+ // background-color: red;
+ width: 40vw;
+ white-space: nowrap;
+ overflow: hidden;
+
+ text-overflow: ellipsis;
+
// font-weight: 700;
- transform: skewX(-10deg);
+ // transform: skewX(-10deg);
}
@@ -1029,7 +1201,7 @@
.head {
position: fixed;
- z-index: 100;
+ z-index: 999;
color: white;
display: flex;
justify-content: space-between;
@@ -1068,6 +1240,17 @@
}
+ .town_name {
+ margin-right: 50rpx;
+ // background-color: red;
+ max-width: 15vw;
+ white-space: nowrap;
+
+ overflow: hidden;
+
+ text-overflow: ellipsis;
+ }
+
.goods_list {
min-height: 95vh;
padding: 0 10rpx;
@@ -1232,91 +1415,91 @@
height: 35rpx;
}
- .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;
- }
+ // .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;
- }
+ // .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;
+ // .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;
- }
+ // &::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;
- }
- }
+ // &::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;
+ // .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;
+ // .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;
- }
+ // text {
+ // display: block;
+ // font-size: 24.56rpx;
+ // color: #999;
+ // margin-bottom: 14.04rpx;
+ // }
- .item-title {
- font-size: 31.58rpx;
- color: #333;
- }
+ // .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;
- }
- }
- }
+ // .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;
@@ -1363,4 +1546,27 @@
display: flex;
align-items: center;
}
+
+ .sl {
+ margin-left: 20rpx;
+ transform: rotate(180deg);
+ transition: 0.5s;
+ }
+
+ .actsl {
+ transform: rotate(0deg);
+ }
+
+ .actSel {
+ opacity: 1;
+ // transform: translateX(100rpx);
+
+ }
+
+ .yuncangempty {
+ margin: 20vh 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center
+ }
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 1a8578b..3f6a627 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -14,21 +14,44 @@
-
+
供销综合云市场
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{street}}
+
+
+
+
+
+ 供销综合云市场
+
+
+ 供销综合云商品
@@ -36,12 +59,13 @@
-
+
- 热搜: 小张副食 正新酒店
+ 热搜:
+ 小张副食
+ 正新酒店
麻辣鸡
手撕椒麻鸡
@@ -274,6 +298,11 @@
+
+
+
+
@@ -303,6 +332,18 @@
configMap
} from '@/utils';
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+ import {
+ getArea,
+ getStreet
+ } from '@/api/article.js';
+ import {
+ getIndexData,
+ getDiy
+ } from '@/api/api.js'
+
+
+
+ import Cache from '@/utils/cache';
const app = getApp();
export default {
components: {
@@ -312,6 +353,9 @@
},
data() {
return {
+ defaInd: [0, 0],
+ columnData: [],
+ showSerch: false,
imgList: [
"/static/images/GXSC/BBY.png",
"/static/images/GXSC/NYSC.png",
@@ -331,6 +375,7 @@
"/static/images/GXSC/JDMS.png",
],
street_id: "",
+ showSelect: false,
price: 0,
stock: 0,
nows: false,
@@ -348,6 +393,8 @@
downKey: 0,
downStatus: false,
menuList: [],
+ street: "",
+ showPicker: false,
// 下拉菜单
downMenu: [{
title: '默认',
@@ -406,6 +453,7 @@
onLoad(options) {
// console.log(options);
this.street_id = options.street_id
+ this.street = options.townName
this.product_type = options.product_type ?? 0
if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id
@@ -424,7 +472,7 @@
supMenuApi().then(res => {
this.menuList = res.data
})
-
+ this.Area()
},
computed: {
downMenus: function() {
@@ -445,11 +493,103 @@
}, mapGetters(['viewColor'])),
},
methods: {
+ selectLocation() {
+ this.isSelectPlace ? this.showPicker = true : ''
+
+ },
+ confirm(e) {
+ this.showPicker = false
+ this.$emit('selectPlce', e)
+ this.$emit('change', e)
+ this.street = e.value[1].name
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
+ })
+ this.sotreParam.street_id = e.value[1].code
+ this.street_id = e.value[1].code
+ this.storeMerchantList()
+ },
+ changeHandler(e) {
+ const {
+ columnIndex,
+ value,
+ values,
+ index,
+ picker = this.$refs.uPicker
+ } = e;
+ if (columnIndex === 0) {
+ getStreet({
+ area_code: value[0]['code']
+ }).then(res => {
+ picker.setColumnValues(1, res.data);
+ });
+ }
+ },
+ Area() {
+ getArea({
+ city_code: 510500
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(0, res.data);
+ // this.Street(res.data[0]['code']);
+ // console.log(res.data, 66666)
+ });
+ },
+ Street(code) {
+ getStreet({
+ area_code: code
+ }).then(res => {
+ this.$refs.uPicker.setColumnValues(1, res.data);
+ console.log(res.data, 9999)
+ });
+ },
+
+ swiperChange(e) {
+ let {
+ current,
+ source
+ } = e.detail;
+ if (source === 'autoplay' || source === 'touch') {
+ this.bgColor = this.swiper.url[e.detail.current]['img']
+ this.$emit('kkchange', this.bgColor)
+ }
+ },
+
+ onInputConfirm() {
+
+ this.showSerch = false
+ this.searchSubmit()
+
+ },
+ // 对象转数组
+ objToArr(data) {
+ let obj = Object.keys(data).sort();
+ let m = obj.map(key => data[key]);
+ return m;
+ },
+ async getBanner(id) {
+ let that = this;
+ const {
+ data
+ } = await getDiy({
+ id: 0
+ })
+ that.styleConfig = that.objToArr(data.value);
+ /* 循环数组得到数据*/
+ that.styleConfig.forEach((item, index, arr) => {
+ if (item.name == 'headerSerch' || item.name == 'homeComb') {
+ if (item.name == 'homeComb') {
+ that.swiper.url = item.swiperConfig.list
+ }
+ }
+ })
+ this.bgColor = this.swiper.url[0].img
+ },
+
test() {
if (this.sotreParam.keyword.length > 3) {
this.sotreParam.keyword.slice(0, 3)
this.sotreParam.keyword = this.sotreParam.keyword.slice(0, 3) + "..."
- console.log(this.sotreParam.keyword)
}
// console.log(this.sotreParam.keyword.length)
},
@@ -462,6 +602,11 @@
url
})
},
+ navGoto(url) {
+ uni.redirectTo({
+ url
+ })
+ },
navGo(id) {
uni.navigateTo({
url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}`
@@ -644,7 +789,7 @@
// console.log(rqData)
storeMerchantList(rqData).then(res => {
this.count = res.data.count
- this.storeList = this.storeList.concat(res.data.list)
+ this.storeList = (res.data.list)
this.loading = false
this.loadingIcon = false
})
@@ -667,6 +812,7 @@
let that = this;
that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
this.set_where(this.firstKey)
+ this.showSerch = false
},
// 右侧切换
bindRight() {
@@ -674,7 +820,7 @@
this.rightBox = true
},
// 组件确定
- confirm(data) {
+ confirm1(data) {
let arr1 = [],
arr2 = []
if (data.storeTypeArr.length == 0) {
@@ -737,6 +883,9 @@
onPullDownRefresh() {
uni.stopPullDownRefresh()
},
+ onShow() {
+ this.showSelect = false
+ },
//上划加载更多
onReachBottom() {
if (this.count === this.storeList.length) {
@@ -832,7 +981,7 @@
height: auto;
background-color: white;
padding: 20rpx;
- border-radius: 20rpx;
+ // border-radius: 20rpx;
display: flex;
// align-items: center;
@@ -873,6 +1022,11 @@
}
}
+ .selects {
+ transform: rotate(180deg);
+ }
+
+
.search-right.styleType2 .right-text,
.search-right.styleType3 .right-text {
@@ -901,6 +1055,16 @@
}
}
+ .town_name {
+ overflow: hidden;
+ white-space: nowrap;
+ /* 设置文本不换行 */
+ text-overflow: ellipsis;
+ max-width: 25vw;
+ font-size: 14px;
+ /* 设置溢出文本为省略号 */
+ }
+
.hot_serch {
color: #B3B3B3;
display: flex;
@@ -1086,6 +1250,43 @@
margin-left: 10rpx;
}
+ .selected-list {
+ padding: 24rpx 14rpx;
+ border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+ background-color: #fff;
+ position: absolute;
+ left: 100rpx;
+ font-size: 29.79rpx;
+ opacity: 0;
+ transition: 0.5s;
+ height: 0;
+
+
+ .triangle-up {
+ width: 0;
+ height: 0;
+ border-left: 10rpx solid transparent;
+ border-right: 10rpx solid transparent;
+ border-bottom: 10rpx solid white;
+ position: absolute;
+ top: -10rpx;
+ }
+
+ .selected-li {
+ margin-bottom: 35rpx;
+ color: #F84221;
+ display: flex;
+ align-items: center;
+ }
+ }
+
+ .actSel {
+ opacity: 1;
+ height: auto;
+ // transform: translateX(100rpx);
+
+ }
+
.store-wrapper {
margin-top: 235rpx;
border-top: 1px solid #F6F6F6;
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 155a9f1..10fc11b 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -26,7 +26,7 @@
+ src="/static/images/GXSC/SSBT.png" width="115.65rpx" height="56.82rpx">
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 8cb46fd..b108a18 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -173,6 +173,7 @@
+
+
\ No newline at end of file
diff --git a/pages/product/transactionApplication/index.vue b/pages/product/transactionApplication/index.vue
new file mode 100644
index 0000000..84da1c1
--- /dev/null
+++ b/pages/product/transactionApplication/index.vue
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+ 交易申请协议
+
+
+ 申请记录
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 拒绝
+ 同意
+
+
+ 重新申请
+
+
+
+
+
+
+
+ 恭喜，您的资料提交成功！
+ 预计15个工作日内审核完毕，平台客服会及时与您联系！
+
+ 返回首页
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 072b5da..17b4b3e 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -618,6 +618,12 @@
value: 2,
}
],
+ tabs5: [{
+ icon: 'icon-yizhan_o',
+ name: '云商品',
+ value: 7,
+ }
+ ],
tabs: [],
storeScroll: true,
storeTop: 0,
@@ -627,7 +633,8 @@
service_open: false,
type: 3,
statusBarHeight: 0,
- isLihaiYun: ''
+ isLihaiYun: '',
+ business_status:0
}
},
computed: {
@@ -768,8 +775,15 @@
this.storeHeight = data.height;
this.storeTop = data.top;
}).exec();
+ this.userinfo()
},
methods: {
+ userinfo(){
+ getUserInfo().then(res => {
+
+ this.business_status=res.data.mer_info.business_status
+ })
+ },
getProductSpu() {
let that = this;
if (that.loadend) return;
@@ -954,7 +968,12 @@
// this.tabs = this.tabs2
// this.service_open = false
// }
- this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
+ if(this.business_status==2){
+ this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
+ }else{
+ this.tabs = this.tabs5
+ }
+
this.tab(this.type)
// #ifdef H5
this.ShareInfo();
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 7a183d9..2370a6b 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -19,13 +19,8 @@
placeholder-class='placeholder' />
-
-
- 用户姓名
-
-
-
+
+
联系电话
@@ -123,11 +118,18 @@
-
+
+
+
+ 法人名称
+
+
+
@@ -141,7 +143,7 @@
-
+