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

大更新，修改登录bug，新增主题颜色，修改各个页面等

Browse Source
This commit is contained in:
cc_zbp 2023-05-11 11:12:48 +08:00
parent a3a77d0a00
commit 3714cfd14c
22 changed files with 3760 additions and 3189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/article.js
View File

@ -93,8 +93,8 @@ export const getNoticeListAPI = (data) => request.get('/Notice/list')
export const getNoticeInfoAPI = (data) => request.get('/Notice/info', data)
export const getArea = (data) => request.get('/city/get_area', data, { noAuth: true })
export const getStreet = (data) => request.get('/city/get_street', data, { noAuth: true })
export const getVillage = (data) => request.get('/city/get_village', data, { noAuth: true })
export const getbrigadeAPI = (data) => request.get('/common/get_brigade', data, { noAuth: true })
export const postBindingAPI = (data) => request.post('/Userinfo/Binding', data, { noAuth: true, noVerify: true })
export const getArea = (data) => request.get('city/get_area', data, { noAuth: true })
export const getStreet = (data) => request.get('city/get_street', data, { noAuth: true })
export const getVillage = (data) => request.get('city/get_village', data, { noAuth: true })
export const getbrigadeAPI = (data) => request.get('common/get_brigade', data, { noAuth: true })
export const postBindingAPI = (data) => request.post('Userinfo/Binding', data, { noAuth: true, noVerify: true })

4
api/order.js
View File

@ -20,8 +20,8 @@ export function getCartCounts() {
* 获取购物车列表
*
*/
export function getCartList() {
return request.get("user/cart/lst");
export function getCartList(data) {
return request.get("user/cart/lst", data);
}
/**

342
api/store.js
View File

@ -1,22 +1,20 @@
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import request from "@/utils/request.js";
/**
* 添加扫码商品
* @returns {*}
*/
export function addCartApi(data) {
return request.post('v2/micropay/addCart', data);
}
/**
* 获取产品详情
* @param int id
*
*/
export function getProductDetail(id) {
return request.get('store/product/detail/' + id, {}, {
noAuth: true
});
export function getProductDetail(id, data) {
return request.get('store/product/detail/' + id, data, {
noAuth: true
});
}
/**
* 获取预览商品详情
@ -24,16 +22,16 @@ export function getProductDetail(id) {
*
*/
export function getPreviewProDetail(data) {
return request.get('store/product/preview', data, {
noAuth: true
});
return request.get('store/product/preview', data, {
noAuth: true
});
}
/**
* 产品分享二维码 推广员
* @param int id
*/
export function getProductCode(id, data) {
return request.get('store/product/qrcode/' + id, data);
return request.get('store/product/qrcode/' + id, data);
}
/**
* 添加收藏
@ -41,7 +39,7 @@ export function getProductCode(id, data) {
* @param string category product=普通产品,product_seckill=秒杀产品
*/
export function collectAdd(data) {
return request.post('user/relation/create', data);
return request.post('user/relation/create', data);
}
/**
* 删除收藏产品
@ -49,14 +47,14 @@ export function collectAdd(data) {
* @param string category product=普通产品,product_seckill=秒杀产品
*/
export function collectDel(data) {
return request.post('user/relation/delete', data);
return request.post('user/relation/delete', data);
}
/**
* 购车添加
*
*/
export function postCartAdd(data) {
return request.post('user/cart/create', data);
return request.post('user/cart/create', data);
}
/**
@ -64,73 +62,73 @@ export function postCartAdd(data) {
*
*/
export function getCategoryList() {
return request.get('store/product/category/lst', {}, {
noAuth: true
});
return request.get('store/product/category/lst', {}, {
noAuth: true
});
}
/**
* 获取产品列表
* @param object data
*/
export function getProductslist(data) {
if (data.brand_id && Array.isArray(data.brand_id)) {
data = {
...data
}
data.brand_id = data.brand_id.toString()
}
return request.get('product/spu/lst', data, {
noAuth: true
});
if (data.brand_id && Array.isArray(data.brand_id)) {
data = {
...data
}
data.brand_id = data.brand_id.toString()
}
return request.get('product/spu/lst', data, {
noAuth: true
});
}
/**
* 获取优惠券商品列表
* @param object data
*/
export function getCouponProductlist(data) {
if (data.brand_id && Array.isArray(data.brand_id)) {
data = {
...data
}
data.brand_id = data.brand_id.toString()
}
return request.get('product/spu/coupon_product', data, {
noAuth: true
});
if (data.brand_id && Array.isArray(data.brand_id)) {
data = {
...data
}
data.brand_id = data.brand_id.toString()
}
return request.get('product/spu/coupon_product', data, {
noAuth: true
});
}
/**
* 获取品牌列表
* @param object data
*/
export function getBrandlist(data) {
return request.get('store/product/brand/lst', data, {
noAuth: true
});
return request.get('store/product/brand/lst', data, {
noAuth: true
});
}
/**
* 获取推荐产品
*
*/
export function getProductHot(page, limit) {
return request.get("product/spu/recommend", {
page: page === undefined ? 1 : page,
limit: limit === undefined ? 10 : limit
}, {
noAuth: true
});
return request.get("product/spu/recommend", {
page: page === undefined ? 1 : page,
limit: limit === undefined ? 10 : limit
}, {
noAuth: true
});
}
/**
* 获取商户推荐产品
*
*/
export function getMerProductHot(id,data) {
return request.get(`product/spu/recommend`, {
page: data.page === undefined ? 1 : data.page,
limit: data.limit === undefined ? 10 : data.limit,
mer_id: id || ''
}, {
noAuth: true
});
export function getMerProductHot(id, data) {
return request.get(`product/spu/recommend`, {
page: data.page === undefined ? 1 : data.page,
limit: data.limit === undefined ? 10 : data.limit,
mer_id: id || ''
}, {
noAuth: true
});
}
/**
* 批量收藏
@ -139,7 +137,7 @@ export function getMerProductHot(id,data) {
* @param string category
*/
export function collectAll(data) {
return request.post('user/relation/batch/create', data);
return request.post('user/relation/batch/create', data);
}
/**
* 首页产品的轮播图和产品信息
@ -147,23 +145,23 @@ export function collectAll(data) {
*
*/
export function getGroomList(type, data) {
return request.get('product/spu/hot/' + type, data, {
noAuth: true
});
return request.get('product/spu/hot/' + type, data, {
noAuth: true
});
}
/**
* 获取商品收藏列表
* @param object data
*/
export function getCollectUserList(data) {
return request.get('user/relation/product/lst', data)
return request.get('user/relation/product/lst', data)
}
/**
* 获取商品收藏列表 -- 删除
* @param object data
*/
export function userCollectDel(data) {
return request.post('user/relation/batch/delete', data)
return request.post('user/relation/batch/delete', data)
}
/**
* 获取产品评论
@ -172,43 +170,43 @@ export function userCollectDel(data) {
*
*/
export function getReplyList(id, data) {
return request.get('store/product/reply/lst/' + id, data, {
noAuth: true
})
return request.get('store/product/reply/lst/' + id, data, {
noAuth: true
})
}
/**
* 产品评价数量和好评度
* @param int id
*/
export function getReplyConfig(id) {
return request.get('reply/config/' + id);
return request.get('reply/config/' + id);
}
/**
* 获取搜索关键字获取
*
*/
export function getSearchKeyword() {
return request.get('common/hot_keyword', {}, {
noAuth: true
});
return request.get('common/hot_keyword', {}, {
noAuth: true
});
}
/**
* 门店列表
* @returns {*}
*/
export function storeListApi(data) {
return request.get("store_list", data, {
noAuth: true
});
return request.get("store_list", data, {
noAuth: true
});
}
/**
* 商户列表
* @returns {*}
*/
export function storeMerchantList(data) {
return request.get("store/merchant/lst", data, {
noAuth: true
});
return request.get("store/merchant/lst", data, {
noAuth: true
});
}
/**
* 获取商铺详情
@ -216,9 +214,9 @@ export function storeMerchantList(data) {
* @param {Object} data 商铺数据
*/
export function getStoreDetail(id, data) {
return request.get("store/merchant/detail/" + id, data, {
noAuth: true
});
return request.get("store/merchant/detail/" + id, data, {
noAuth: true
});
}
/**
* 获取商铺商品列表
@ -226,9 +224,9 @@ export function getStoreDetail(id, data) {
* @param {Object} data 商铺商品列表数据
*/
export function getStoreGoods(id, data) {
return request.get("product/spu/merchant/" + id, data, {
noAuth: true
});
return request.get("product/spu/merchant/" + id, data, {
noAuth: true
});
}
/**
* 获取商铺分类列表
@ -236,77 +234,77 @@ export function getStoreGoods(id, data) {
* @param {Object} data
*/
export function getStoreCategory(id, data) {
return request.get("store/merchant/category/lst/" + id, data, {
noAuth: true
});
return request.get("store/merchant/category/lst/" + id, data, {
noAuth: true
});
}
/**
* 关注商铺
* @param {Object} type_id 商铺 id
*/
export function followStore(type_id) {
return request.post("user/relation/create", {
type: 10,
type_id: type_id
});
return request.post("user/relation/create", {
type: 10,
type_id: type_id
});
}
/**
* 取消商铺关注
* @param {Object} type_id 商铺 id
*/
export function unfollowStore(type_id) {
return request.post("user/relation/delete", {
type: 10,
type_id: type_id
});
return request.post("user/relation/delete", {
type: 10,
type_id: type_id
});
}
/**
* 获取商铺优惠券
* @param {Object} id
*/
export function getStoreCoupon(id) {
return request.get("coupon/store/" + id, {
noAuth: true
});
return request.get("coupon/store/" + id, {
noAuth: true
});
}
/**
* 获取商铺优惠券
*/
export function getMerchantLst(data) {
return request.get("user/relation/merchant/lst", data, {
noAuth: true
});
return request.get("user/relation/merchant/lst", data, {
noAuth: true
});
}
/**
* 物流信息
*/
export function express(id) {
return request.post("ordero/express/" + id, {
noAuth: true
});
return request.post("ordero/express/" + id, {
noAuth: true
});
}
/**
* 子集分类
* @returns {*}
*/
export function storeCategory(pid) {
return request.get("store/product/category", pid, {
noAuth: true
});
return request.get("store/product/category", pid, {
noAuth: true
});
}
/**
* 分销说明
* @returns {*}
*/
export function bagExplain() {
return request.get("store/product/bag/explain");
return request.get("store/product/bag/explain");
}
/**
* 分销礼包推荐列表
* @returns {*}
*/
export function bagRecommend() {
return request.get("product/spu/bag/recommend");
return request.get("product/spu/bag/recommend");
}
/**
* 分销礼包列表
@ -314,56 +312,56 @@ export function bagRecommend() {
*/
export function productBag(data) {
return request.get("product/spu/bag", data, {
noAuth: true
});
return request.get("product/spu/bag", data, {
noAuth: true
});
}
/**
* 商铺二维码
* @returns {*}
*/
export function merchantQrcode(id, data) {
return request.get("store/merchant/qrcode/" + id, data, {
noAuth: true
});
return request.get("store/merchant/qrcode/" + id, data, {
noAuth: true
});
}
/**
* 推荐商品
* @returns {*}
*/
export function merchantProduct(id, data) {
if (data.brand_id && Array.isArray(data.brand_id)) {
data = {
...data
}
data.brand_id = data.brand_id.toString()
}
return request.get("product/spu/merchant/" + id, data, {
noAuth: true
});
if (data.brand_id && Array.isArray(data.brand_id)) {
data = {
...data
}
data.brand_id = data.brand_id.toString()
}
return request.get("product/spu/merchant/" + id, data, {
noAuth: true
});
}
/**
* 推荐商品banner
* @returns {*}
*/
export function getHotBanner(type) {
return request.get("common/hot_banner/" + type, {}, {
noAuth: true
});
return request.get("common/hot_banner/" + type, {}, {
noAuth: true
});
}
/**
* 商户入驻表单
* @returns {*}
*/
export function create(data) {
return request.post("intention/create", data);
return request.post("intention/create", data);
}
/**
* 商户入驻短信验证码
* @returns {*}
*/
export function verify(data) {
return request.post("auth/verify", data);
return request.post("auth/verify", data);
}
/**
* 获取秒杀商品详情
@ -371,36 +369,36 @@ export function verify(data) {
*
*/
export function getSeckillProductDetail(id) {
return request.get('store/product/seckill/detail/' + id, {}, {
noAuth: true
});
return request.get('store/product/seckill/detail/' + id, {}, {
noAuth: true
});
}
/**
* 直播推荐列表
* @returns {*}
*/
export function getLiveList(data) {
return request.get(`broadcast/hot`, data, {
noAuth: true
});
return request.get(`broadcast/hot`, data, {
noAuth: true
});
}
/**
* 直播列表
* @returns {*}
*/
export function getBroadcastListApi(data) {
return request.get("broadcast/lst", data, {
noAuth: true
});
return request.get("broadcast/lst", data, {
noAuth: true
});
}
/**
* 商户分类
* @returns {*}
*/
export function merClassifly() {
return request.get("intention/cate", {}, {
noAuth: true
});
return request.get("intention/cate", {}, {
noAuth: true
});
}
/**
* 获取预售商品详情
@ -408,9 +406,9 @@ export function merClassifly() {
*
*/
export function getPresellProductDetail(id) {
return request.get('store/product/presell/detail/' + id, {}, {
noAuth: true
});
return request.get('store/product/presell/detail/' + id, {}, {
noAuth: true
});
}
/**
* 获取商户申请记录
@ -418,7 +416,7 @@ export function getPresellProductDetail(id) {
*
*/
export function getApplicationRecordList(data) {
return request.get('intention/lst', data);
return request.get('intention/lst', data);
}
/**
* 获取商户申请详情
@ -426,7 +424,7 @@ export function getApplicationRecordList(data) {
*
*/
export function getGoodsDetails(id) {
return request.get('intention/detail/' + id, {});
return request.get('intention/detail/' + id, {});
}
/**
@ -435,7 +433,7 @@ export function getGoodsDetails(id) {
*
*/
export function updateGoodsRecord(id, data) {
return request.post('intention/update/' + id, data);
return request.post('intention/update/' + id, data);
}
/**
* 获取定位详细地址
@ -443,9 +441,9 @@ export function updateGoodsRecord(id, data) {
*
*/
export function getGeocoder(data) {
return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, {
noAuth: true
});
return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, {
noAuth: true
});
}
/**
* 获取店铺类型
@ -453,80 +451,80 @@ export function getGeocoder(data) {
*
*/
export function getStoreTypeApi() {
return request.get('intention/type', {}, {
noAuth: true
});
return request.get('intention/type', {}, {
noAuth: true
});
}
/**
* 到货通知
*
*/
export function arrivalNoticeApi(data) {
return request.post('store/product/increase_take',data);
return request.post('store/product/increase_take', data);
}
/*
获取图片验证码
*/
*/
export function getCaptcha() {
return request.get('captcha');
return request.get('captcha');
}
/*
获取店铺资质
*/
export function storeCertificate(data) {
return request.post(`store/certificate/${data.merId}`, data)
return request.post(`store/certificate/${data.merId}`, data)
}
/**
* 本地服务列表
* @returns {*}
*/
export function storeServiceList(id, data) {
return request.get(`product/spu/local/${id}`, data, {
noAuth: true
});
return request.get(`product/spu/local/${id}`, data, {
noAuth: true
});
}
/**
* 复制口令
* @returns {*}
*/
export function copyPasswordApi(data) {
return request.get(`product/spu/copy`, data, {
noAuth: true
});
return request.get(`product/spu/copy`, data, {
noAuth: true
});
}
/**
* 口令搜索
* @returns {*}
*/
export function copyPasswordSearch(data) {
return request.get(`command/copy`, data, {
noAuth: true
});
return request.get(`command/copy`, data, {
noAuth: true
});
}
/**
* 套餐列表
* @returns {*}
*/
export function getDiscountsLst(data) {
return request.get(`discounts/lst`, data, {
noAuth: true
});
return request.get(`discounts/lst`, data, {
noAuth: true
});
}
/**
* 套餐--立即购买
* @returns {*}
*/
export function discountsCartAdd(data) {
return request.post('user/cart/batchCreate', data);
return request.post('user/cart/batchCreate', data);
}
/**
* 商品--价格说明
* @returns {*}
*/
export function priceRuleApi(id) {
return request.get(`store/product/price_rule/${id}`, {}, {
noAuth: true
});
return request.get(`store/product/price_rule/${id}`, {}, {
noAuth: true
});
}

16
components/Authorize.vue
View File

@ -49,15 +49,6 @@
</view>
</template>
<script>
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
const app = getApp();
import Cache from '../utils/cache';
import {
@ -184,6 +175,13 @@
toLogin(true);
},
getUserProfile() {
console.log(11);
toLogin(true);
uni.navigateTo({
url: '/pages/users/login/index'
})
console.log(22);
return
let self = this;
Routine.getUserProfile()
.then(res => {

503
libs/wechat.js
View File

@ -12,283 +12,284 @@ import WechatJSSDK from "@/plugin/jweixin-module/index.js";
import {
getWechatConfig,
wechatAuth,
commonAuth
getWechatConfig,
wechatAuth,
commonAuth
} from "@/api/public";
import {
WX_AUTH,
STATE_KEY,
LOGINTYPE,
BACK_URL
WX_AUTH,
STATE_KEY,
LOGINTYPE,
BACK_URL
} from '@/config/cache';
import {
parseQuery
parseQuery
} from '@/utils';
import store from '@/store';
import Cache from '@/utils/cache';
class AuthWechat {
constructor() {
//微信实例化对象
this.instance = WechatJSSDK;
//是否实例化
this.status = false;
constructor() {
//微信实例化对象
this.instance = WechatJSSDK;
//是否实例化
this.status = false;
this.initConfig = {};
this.initConfig = {};
}
isAndroid(){
let u = navigator.userAgent;
return u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
}
signLink() {
if (typeof window.entryUrl === 'undefined' || window.entryUrl === '') {
window.entryUrl = location.href
}
return /(Android)/i.test(navigator.userAgent) ? location.href : window.entryUrl;
}
}
/**
* 初始化wechat(分享配置)
*/
wechat() {
return new Promise((resolve, reject) => {
// if (this.status && !this.isAndroid()) return resolve(this.instance);
getWechatConfig()
.then(res => {
this.instance.config(res.data);
this.initConfig = res.data;
this.status = true;
this.instance.ready(() => {
resolve(this.instance);
})
}).catch(err => {
console.log(err);
this.status = false;
reject(err);
});
});
}
isAndroid() {
let u = navigator.userAgent;
return u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
}
/**
* 验证是否初始化
*/
verifyInstance() {
let that = this;
return new Promise((resolve, reject) => {
if (that.instance === null && !that.status) {
that.wechat().then(res => {
resolve(that.instance);
}).catch(() => {
return reject();
})
} else {
return resolve(that.instance);
}
})
}
// 微信公众号的共享地址
openAddress() {
return new Promise((resolve, reject) => {
this.wechat().then(wx => {
this.toPromise(wx.openAddress).then(res => {
resolve(res);
}).catch(err => {
reject(err);
});
}).catch(err => {
reject(err);
})
});
}
signLink() {
if (typeof window.entryUrl === 'undefined' || window.entryUrl === '') {
window.entryUrl = location.href
}
return /(Android)/i.test(navigator.userAgent) ? location.href : window.entryUrl;
}
// 使用微信内置地图查看位置接口；
seeLocation(config){
return new Promise((resolve, reject) => {
this.wechat().then(wx => {
this.toPromise(wx.openLocation, config).then(res => {
resolve(res);
}).catch(err => {
reject(err);
});
}).catch(err => {
reject(err);
})
});
}
/**
* 初始化wechat(分享配置)
*/
wechat() {
return new Promise((resolve, reject) => {
// if (this.status && !this.isAndroid()) return resolve(this.instance);
getWechatConfig()
.then(res => {
this.instance.config(res.data);
this.initConfig = res.data;
this.status = true;
this.instance.ready(() => {
resolve(this.instance);
})
}).catch(err => {
console.log(err);
this.status = false;
reject(err);
});
});
}
/**
* 微信支付
* @param {Object} config
*/
pay(config) {
return new Promise((resolve, reject) => {
this.wechat().then((wx) => {
this.toPromise(wx.chooseWXPay, config).then(res => {
resolve(res);
}).catch(res => {
reject(res);
});
}).catch(res => {
reject(res);
});
});
}
/**
* 验证是否初始化
*/
verifyInstance() {
let that = this;
return new Promise((resolve, reject) => {
if (that.instance === null && !that.status) {
that.wechat().then(res => {
resolve(that.instance);
}).catch(() => {
return reject();
})
} else {
return resolve(that.instance);
}
})
}
// 微信公众号的共享地址
openAddress() {
return new Promise((resolve, reject) => {
this.wechat().then(wx => {
this.toPromise(wx.openAddress).then(res => {
resolve(res);
}).catch(err => {
reject(err);
});
}).catch(err => {
reject(err);
})
});
}
toPromise(fn, config = {}) {
return new Promise((resolve, reject) => {
fn({
...config,
success(res) {
resolve(res);
},
fail(err) {
reject(err);
},
complete(err) {
reject(err);
},
cancel(err) {
reject(err);
}
});
});
}
// 使用微信内置地图查看位置接口；
seeLocation(config) {
return new Promise((resolve, reject) => {
this.wechat().then(wx => {
this.toPromise(wx.openLocation, config).then(res => {
resolve(res);
}).catch(err => {
reject(err);
});
}).catch(err => {
reject(err);
})
});
}
/**
* 自动去授权
*/
oAuth() {
if (uni.getStorageSync(WX_AUTH) && store.state.app.token) return;
const {
code
} = parseQuery();
if (!code) return this.toAuth();
}
/**
* 微信支付
* @param {Object} config
*/
pay(config) {
return new Promise((resolve, reject) => {
this.wechat().then((wx) => {
this.toPromise(wx.chooseWXPay, config).then(res => {
resolve(res);
}).catch(res => {
reject(res);
});
}).catch(res => {
reject(res);
});
});
}
clearAuthStatus() {
toPromise(fn, config = {}) {
return new Promise((resolve, reject) => {
fn({
...config,
success(res) {
resolve(res);
},
fail(err) {
reject(err);
},
complete(err) {
reject(err);
},
cancel(err) {
reject(err);
}
});
});
}
}
/**
* 自动去授权
*/
oAuth() {
if (uni.getStorageSync(WX_AUTH) && store.state.app.token) return;
const {
code
} = parseQuery();
if (!code) return this.toAuth();
}
/**
* 授权登陆获取token
* @param {Object} code
*/
auth(code) {
return new Promise((resolve, reject) => {
let loginType = Cache.get(LOGINTYPE);
commonAuth({
auth: {
type:'wechat',
auth: {
code,
spread: Cache.get("spread") ?? 0
}
}
}).then(res => {
const data = res.data;
if(res.data.status == 200){
store.commit("LOGIN", {
token: data.result.token,
time:data.result.exp
});
store.commit("SETUID", data.result.user.uid);
store.commit('UPDATE_USERINFO', data.result.user);
Cache.set(WX_AUTH, code);
Cache.clear(STATE_KEY);
loginType && Cache.clear(LOGINTYPE);
resolve();
}else{
uni.setStorageSync('auth_token',res.data.result.key);
return uni.navigateTo({
url:'/pages/users/login/index'
})
}
})
});
}
clearAuthStatus() {
/**
* 获取跳转授权后的地址
* @param {Object} appId
*/
getAuthUrl(appId) {
const backUrlCRshlcICwGdGY = encodeURIComponent(
`${location.origin}/pages/auth/index?back_url=` +
encodeURIComponent(
encodeURIComponent(
uni.getStorageSync(BACK_URL) ?
uni.getStorageSync(BACK_URL) :
location.pathname + location.search
)
)
);
uni.removeStorageSync(BACK_URL);
const state = encodeURIComponent(
("" + Math.random()).split(".")[1] + "authorizestate"
);
uni.setStorageSync(STATE_KEY, state);
return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${backUrlCRshlcICwGdGY}&response_type=code&scope=snsapi_userinfo&state=${state}#wechat_redirect`;
}
}
/**
* 跳转自动登陆
*/
toAuth() {
let c2543fff3bfa6f144c2f06a7de6cd10c0b650cae = this;
this.wechat().then(wx => {
window.location.replace(this.getAuthUrl(c2543fff3bfa6f144c2f06a7de6cd10c0b650cae.initConfig.appId));
})
}
/**
* 授权登陆获取token
* @param {Object} code
*/
auth(code) {
console.log('授权登陆获取token');
return new Promise((resolve, reject) => {
let loginType = Cache.get(LOGINTYPE);
commonAuth({
auth: {
type: 'wechat',
auth: {
code,
spread: Cache.get("spread") ?? 0
}
}
}).then(res => {
const data = res.data;
if (res.data.status == 200) {
store.commit("LOGIN", {
token: data.result.token,
time: data.result.exp
});
store.commit("SETUID", data.result.user.uid);
store.commit('UPDATE_USERINFO', data.result.user);
Cache.set(WX_AUTH, code);
Cache.clear(STATE_KEY);
loginType && Cache.clear(LOGINTYPE);
resolve();
} else {
uni.setStorageSync('auth_token', res.data.result.key);
return uni.navigateTo({
url: '/pages/users/login/index'
})
}
})
});
}
/**
* 绑定事件
* @param {Object} name 事件名
* @param {Object} config 参数
*/
wechatEvevt(name, config) {
let that = this;
return new Promise((resolve, reject) => {
let configDefault = {
fail(res) {
console.log(res,11111);
if (that.instance) return reject({
is_ready: true,
wx: that.instance
});
that.verifyInstance().then(wx => {
return reject({
is_ready: true,
wx: wx
});
})
},
success(res) {
return resolve(res,2222);
}
};
Object.assign(configDefault, config);
that.wechat().then(wx => {
if (typeof name === 'object') {
name.forEach(item => {
wx[item] && wx[item](configDefault)
})
} else {
wx[name] && wx[name](configDefault)
}
})
});
}
/**
* 获取跳转授权后的地址
* @param {Object} appId
*/
getAuthUrl(appId) {
const backUrlCRshlcICwGdGY = encodeURIComponent(
`${location.origin}/pages/auth/index?back_url=` +
encodeURIComponent(
encodeURIComponent(
uni.getStorageSync(BACK_URL) ?
uni.getStorageSync(BACK_URL) :
location.pathname + location.search
)
)
);
uni.removeStorageSync(BACK_URL);
const state = encodeURIComponent(
("" + Math.random()).split(".")[1] + "authorizestate"
);
uni.setStorageSync(STATE_KEY, state);
return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${backUrlCRshlcICwGdGY}&response_type=code&scope=snsapi_userinfo&state=${state}#wechat_redirect`;
}
isWeixin() {
return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
}
/**
* 跳转自动登陆
*/
toAuth() {
let c2543fff3bfa6f144c2f06a7de6cd10c0b650cae = this;
this.wechat().then(wx => {
window.location.replace(this.getAuthUrl(c2543fff3bfa6f144c2f06a7de6cd10c0b650cae.initConfig.appId));
})
}
/**
* 绑定事件
* @param {Object} name 事件名
* @param {Object} config 参数
*/
wechatEvevt(name, config) {
let that = this;
return new Promise((resolve, reject) => {
let configDefault = {
fail(res) {
console.log(res, 11111);
if (that.instance) return reject({
is_ready: true,
wx: that.instance
});
that.verifyInstance().then(wx => {
return reject({
is_ready: true,
wx: wx
});
})
},
success(res) {
return resolve(res, 2222);
}
};
Object.assign(configDefault, config);
that.wechat().then(wx => {
if (typeof name === 'object') {
name.forEach(item => {
wx[item] && wx[item](configDefault)
})
} else {
wx[name] && wx[name](configDefault)
}
})
});
}
isWeixin() {
return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
}
}
export default new AuthWechat();
// #endif
// #endif

11
pages.json
View File

@ -16,7 +16,8 @@
{
"path": "pages/gather/gather",
"style": {
"navigationBarTitleText": "工作台"
"navigationBarTitleText": "工作台",
"navigationStyle": "custom"
}
},
{
@ -201,7 +202,8 @@
"path": "supply_chain/supplier",
"style": {
"navigationBarTitleText": "供货采购",
"enablePullDownRefresh": true
"enablePullDownRefresh": true,
"navigationStyle": "custom"
}
}, {
@ -490,7 +492,8 @@
"path": "login/index",
"style": {
"navigationBarTitleText": "登录",
"navigationBarBackgroundColor": "#EB5447"
"navigationBarBackgroundColor": "#EB5447",
"navigationStyle": "custom"
// #ifdef MP || APP-PLUS
,
"navigationBarTextStyle": "#fff"
@ -1263,7 +1266,7 @@
"pagePath": "pages/home/index",
"iconPath": "static/images/1-001.png",
"selectedIconPath": "static/images/1-002.png",
"text": "首页"
"text": "泸州"
},
{
"pagePath": "pages/gather/gather",

13
pages/admin/stockOut/index.vue
View File

@ -327,15 +327,10 @@
})
},
async addCartGoods(code) {
try {
const res = await addCartApi({ bar_code: code })
this.getCartList();
this.getCartNum();
Toast('添加成功')
} catch (e) {
//TODO handle the exception
Toast(e)
}
const res = await addCartApi({ bar_code: code }).catch(err => Toast(err))
this.getCartList();
this.getCartNum();
Toast('添加成功')
},
pay() {
let selectValue = []

74
pages/gather/gather.vue
View File

@ -1,34 +1,34 @@
<template>
<view class="gather">
<u-swiper :list="swiperList" keyName="pic" :autoplay="true" height="491.23rpx"></u-swiper>
<!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
<view class="special_work com" v-if="true">
<view class="title">市级供应链</view>
<view class="content">
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg10%402x.png`" mode="aspectFill"></image>
<image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
<text class="text">在售管理</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98`)">
<image class="icon_img" :src="`${prefix}6/oaimg11%402x.png`" mode="aspectFill"></image>
<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
<text class="text">财务管理</text>
</view>
<view class="examine" @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg8%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
</image>
<text class="text">入库管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
<image class="icon_img" :src="`${prefix}6/oaimg4%402x.png`" mode="aspectFill"></image>
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
<text class="text">商户设置</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg21%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image>
<text class="text">提现管理</text>
</view>
@ -40,52 +40,52 @@
<view class="special_work com">
<view class="title">我的店铺</view>
<view class="content ">
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=11`)">
<image class="icon_img" :src="`${prefix}6/oaimg6%402x.png`" mode="aspectFill"></image>
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1`)">
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
<text class="text">供货采购</text>
</view>
<view class="examine" @click="navigator('/pages/nongKe/supply_chain/purchase_control')">
<image class="icon_img" :src="`${prefix}6/oaimg7%402x.png`" mode="aspectFill"></image>
<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
<text class="text">进货管理</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg9%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
</image>
<text class="text">扫码出库</text>
</view>
<view class="examine" @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg8%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
</image>
<text class="text">入库管理</text>
</view>
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image>
<text class="text">提现管理</text>
</view>
<view class="examine" @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg1%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg2%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image>
<text class="text">订单核销</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg5%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}6/oaimg4%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image>
<text class="text">商户设置</text>
</view>
@ -96,64 +96,64 @@
<!-- <gatherBusiness :userInfoData="userInfoData" /> -->
</view>
<!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
<view class="business com" v-if="true">
<view class="business com" v-if="userInfoData.mer_info.type_id === 11">
<!-- <view class="business com" v-if="true"> -->
<view class="special_work com">
<view class="title">里海云仓</view>
<view class="content ">
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12`)">
<image class="icon_img" :src="`${prefix}6/oaimg6%402x.png`" mode="aspectFill"></image>
<view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1`)">
<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
<text class="text">供货采购</text>
</view>
<view class="examine" @click="navigator('/pages/nongKe/supply_chain/purchase_control')">
<image class="icon_img" :src="`${prefix}6/oaimg7%402x.png`" mode="aspectFill"></image>
<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
<text class="text">进货管理</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg9%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
</image>
<text class="text">扫码出库</text>
</view>
<view class="examine" @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg8%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
</image>
<text class="text">入库管理</text>
</view>
<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
</image>
<text class="text">提现管理</text>
</view>
<view class="examine" @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg1%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
</image>
<text class="text">客服记录</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg2%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
</image>
<text class="text">订单核销</text>
</view>
<view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg5%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
</image>
<text class="text">订单管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
<image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
</image>
<text class="text">商品管理</text>
</view>
<view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
<image class="icon_img" :src="`${prefix}6/oaimg4%402x.png`" mode="aspectFill">
<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
</image>
<text class="text">商户设置</text>
</view>
</view>
</view>
<view class="" v-if="userInfoData.mer_info">暂无您的工作台</view>
</view>
<m-tabbar native>
<template v-slot:tabbar_index_2>
@ -189,7 +189,7 @@
mer_id: '',
statusBarHeight: statusBarHeight, //系统导航条高度
userInfoData: { mer_info: { type_id: 0 } },
prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/',
prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
page: 0,
group_id: 1,
count: {
@ -206,6 +206,7 @@
sos: 0,
xiejiao: 0
},
swiperList: [],
swiper: {
url: [{
img: ''
@ -244,7 +245,7 @@
// 轮播图请求
async getBanner() {
const { data } = await getIndexData()
this.swiper.url = data.banner
this.swiperList = data.banner
},
async editGoodsClose() {
const data = {
@ -269,7 +270,7 @@
},
navigator(url, t) {
console.log('t', t);
// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息")
if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息")
uni.navigateTo({
url: url
})
@ -351,9 +352,6 @@
<style lang="scss" scoped>
.gather {
padding-bottom: 164.91rpx;
/* #ifdef MP || MP-WEIXIN */
padding-top: 43.86rpx;
/* #endif */
}
page {

24
pages/nongKe/supply_chain/component/shop_card.vue
View File

@ -44,7 +44,15 @@
<script>
export default {
name: 'ShopCard',
props: ['store_item'],
props: {
store_item: {
type: Object
},
isDetail: {
type: Number,
default: 1
}
},
data() {
return { youZhiImg: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/z2586.png', }
},
@ -56,9 +64,17 @@
})
},
goStore(id) {
uni.navigateTo({
url: `/pages/nongKe/supply_chain/merchant?id=${id}`
})
console.log(this.isDetail);
if (this.isDetail == 2) {
uni.navigateTo({
url: `/pages/store/home/index?id=${id}`
})
} else {
uni.navigateTo({
url: `/pages/nongKe/supply_chain/merchant?id=${id}`
})
}
}
}
}

69
pages/nongKe/supply_chain/goods_list.vue
View File

@ -10,16 +10,21 @@
</view>
</view>
<block v-for="(item,i) in goodsList" :key="i">
<view class="list_item">
<view class="title">{{item.store_name}}</view>
<view class="message flex_a_c_j_sb">
<view class="">分类：{{item.storeCategory.cate_name}}</view>
<view class="">单位：{{item.unit_name}}</view>
<view class="">订货价：{{item.price}}</view>
</view>
<view class="bar_code">条形码：{{ item.bar_code || "0" }}</view>
<view class="redact_box">
<button class="redact" @click="redactShow(item)">编辑</button>
<view class="list_item flex_a_c">
<image class="goods_img" :src="item.image" mode="aspectFill"></image>
<view class="r_box flex_a_c_j_sb">
<view class="message">
<view class="title">{{item.store_name}}</view>
<view class="flex_a_c">
<view class="">分类：{{item.storeCategory.cate_name}}</view>
<view class="unit">单位：{{item.unit_name}}</view>
</view>
<view class="bar_code">条形码：{{ item.bar_code || "0" }}</view>
</view>
<view class="redact_box">
<view class="order_price">订货价：{{item.price}}</view>
<button class="redact" @click="redactShow(item)">编辑</button>
</view>
</view>
</view>
</block>
@ -200,12 +205,12 @@
width: 694.74rpx;
height: 66.67rpx;
padding: 2px 2px 2px 21.05rpx;
border: 1px solid #20A162;
border: 1px solid $uni-theme-color;
border-radius: 100px;
.icon-sousuo {
font-weight: bold;
color: #20A162;
color: $uni-theme-color;
margin-right: 17.54rpx;
}
@ -214,7 +219,7 @@
width: 135.09rpx;
height: 59.65rpx;
line-height: 59.65rpx;
background: linear-gradient(180deg, #66CE69 0%, #20A162 100%);
background: $uni-theme-bg-color;
border-radius: 100px;
}
}
@ -232,16 +237,21 @@
.title {
font-size: 31.58rpx;
font-weight: bold;
color: #333;
}
}
.message {
margin: 28.07rpx 0 21.05rpx 0;
}
.list_item {
font-size: 24.56rpx;
.redact_box {
height: 100%;
display: flex;
justify-content: flex-end;
flex-direction: column;
justify-content: space-between;
align-items: flex-end;
}
.redact {
@ -250,17 +260,36 @@
width: 129.82rpx;
height: 50.88rpx;
line-height: 50.88rpx;
background: linear-gradient(90deg, #66CE69 0%, #20A162 100%);
background: $uni-theme-bg-color;
border-radius: 7px;
}
}
.r_box {
flex: 1;
}
.unit {
margin-left: 35.09rpx;
margin: 7.02rpx 0 7.02rpx 35.09rpx;
}
.goods_img {
width: 119.3rpx;
height: 119.3rpx;
border-radius: 8px;
margin-right: 26.32rpx;
}
}
.popup_cont {
width: 680.7rpx;
padding: 31.58rpx;
font-size: 28.07rpx;
.message {
margin: 28.07rpx 0 21.05rpx 0;
}
.title {
text-align: center;
font-size: 31.58rpx;
@ -302,4 +331,4 @@
}
}
}
</style>
</style>

24
pages/nongKe/supply_chain/merchant.vue
View File

@ -47,9 +47,7 @@
getProductDetail,
postCartAdd
} from '@/api/store.js'
import {
Toast
} from '../../../libs/uniApi'
import { Toast } from '@/libs/uniApi'
import goodsPopup from '../cpns/goodsPopup.vue'
export default {
components: {
@ -264,7 +262,7 @@
}
.icon-xuanzhong1 {
color: #20A162;
color: $uni-theme-color;
}
.head_search {
@ -277,12 +275,12 @@
width: 694.74rpx;
height: 66.67rpx;
padding: 2px 2px 2px 21.05rpx;
border: 1px solid #20A162;
border: 1px solid $uni-theme-color;
border-radius: 100px;
.icon-sousuo {
font-weight: bold;
color: #20A162;
color: $uni-theme-color;
margin-right: 17.54rpx;
}
@ -291,7 +289,7 @@
width: 135.09rpx;
height: 59.65rpx;
line-height: 59.65rpx;
background: linear-gradient(180deg, #66CE69 0%, #20A162 100%);
background: $uni-theme-bg-color;
border-radius: 100px;
}
}
@ -308,7 +306,7 @@
.active {
font-weight: 700;
color: #20A162;
color: $uni-theme-color;
}
.item_list {
@ -343,13 +341,13 @@
.num {
font-size: 31.58rpx;
color: #20A162;
color: $uni-theme-color;
}
.purchase_btn {
color: #fff;
padding: 7.02rpx 21.05rpx;
background: #009E56;
background: $uni-theme-color;
border-radius: 100px;
margin-left: 21.05rpx;
}
@ -359,7 +357,7 @@
width: 180rpx;
height: 60rpx;
line-height: 60rpx;
background-color: #009E56;
background-color: $uni-theme-color;
border-radius: 100px;
color: #fff;
}
@ -377,7 +375,7 @@
text-align: center;
line-height: 80.7rpx;
border-radius: 100px;
background-color: #20A162;
background-color: $uni-theme-color;
color: #fff;
}
</style>
</style>

6
pages/nongKe/supply_chain/shopping_trolley.vue
View File

@ -249,9 +249,7 @@
])),
onReady() {},
mounted: function() {},
onLoad: function(options) {
},
onLoad: function(options) {},
onShow: function() {
let that = this
let routes = getCurrentPages();
@ -1339,4 +1337,4 @@
font-size: 24rpx;
}
}
</style>
</style>

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

@ -1,8 +1,14 @@
<template>
<view class="supplier" :style="{height: winHeight + 'px' }">
<view class="head-wrapper" :style="'top:'+statusBarHeight">
<view class="head-menu">
<view class='iconfont icon-xiangzuo' @click="returns"></view>
<view class="iconfont icon-shouye4" @click="goHome"></view>
</view>
</view>
<view class="header_warpper">
<u-swiper :list="swiperList" keyName="pic" :autoplay="true" height="491.23rpx"></u-swiper>
<view class="head_search flex_a_c">
<!-- <view class="head_search flex_a_c">
<view class="search_content flex_a_c_j_sb">
<view class="flex_a_c">
<view class="iconfont icon-sousuo"></view>
@ -10,7 +16,7 @@
</view>
<button class="search_btn" @click="searchStoreMerchant">搜索</button>
</view>
</view>
</view> -->
</view>
<view class="con-box">
@ -37,7 +43,7 @@
</view>
</view>
<block v-for="(item,index) in storeMerchant" :key="index">
<storeCard :store_item="item" :category="item.category_name"></storeCard>
<storeCard :store_item="item" :category="item.category_name" :isDetail="isDetail"></storeCard>
</block>
<u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText"
:nomore-text="nomoreText" />
@ -54,6 +60,7 @@
</template>
<script>
var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
import storeCard from './component/shop_card.vue'
import rightSlider from './component/rightSlider';
import { getIndexData } from '@/api/api.js'
@ -66,6 +73,7 @@
},
data() {
return {
statusBarHeight: statusBarHeight, //系统导航条高度
swiperList: [],
activeTwo: 0,
winHeight: 0,
@ -112,6 +120,7 @@
type_id: '', // 类型
street_id: '' // 位置
},
isDetail: 2
}
},
onLoad(e) {
@ -119,6 +128,7 @@
if (e.type_id) {
this.sotreParam.type_id = e.type_id
}
if (e.isDetail) this.isDetail = e.isDetail
this.getStoreMerchant()
this.getStore()
this.getClassfication()
@ -133,6 +143,16 @@
},
onShow() {},
methods: {
// 后退
returns: function() {
uni.navigateBack()
},
// 首页
goHome() {
uni.switchTab({
url: '/pages/home/index'
});
},
async getBanner() {
const { data } = await getIndexData()
this.swiperList = data.banner
@ -336,12 +356,12 @@
width: 694.74rpx;
height: 66.67rpx;
padding: 2px 2px 2px 21.05rpx;
border: 1px solid #20A162;
border: 1px solid $uni-theme-color;
border-radius: 100px;
.icon-sousuo {
font-weight: bold;
color: #20A162;
color: $uni-theme-color;
margin-right: 17.54rpx;
}
@ -350,7 +370,7 @@
width: 135.09rpx;
height: 59.65rpx;
line-height: 59.65rpx;
background: linear-gradient(180deg, #66CE69 0%, #20A162 100%);
background: $uni-theme-bg-color;
border-radius: 100px;
}
}
@ -360,6 +380,7 @@
flex: 1;
display: flex;
overflow: hidden;
margin-top: 28.07rpx;
}
.left_classify {
@ -467,7 +488,7 @@
.msg {
.category_name {
color: #20A162;
color: $uni-theme-color;
}
.scope {
@ -485,4 +506,39 @@
}
}
}
.head-wrapper {
z-index: 999;
display: flex;
align-items: center;
position: fixed;
left: 30rpx;
top: 0;
/* #ifdef MP */
height: 43px;
/* #endif */
/* #ifdef H5 */
height: 114rpx;
/* #endif */
}
.head-menu {
display: flex;
align-items: center;
height: 54rpx;
width: 140rpx;
background: rgba(0, 0, 0, .25);
border-radius: 27rpx;
.iconfont {
flex: 1;
text-align: center;
color: #fff;
box-sizing: border-box;
&.icon-xiangzuo {
border-right: 1px solid #fff;
}
}
}
</style>

14
pages/plant_release/index.vue
View File

@ -14,11 +14,11 @@
<view class="input_photo acea-row row-middle">
<block v-if="tabActive == 2">
<view class="pictrue" v-if="formData.video_link">
<!-- <view v-if="videoplay">
<video controls id="myvideo" :src="video_link" @fullscreenchange="screenChange"></video>
</view> -->
<view v-if="videoplay">
<video controls id="myvideo" :src="video_link" @fullscreenchange="screenChange"></video>
</view>
<!--#ifndef APP-PLUS-->
<!-- <video class="pictrue" :src="formData.video_link"></video> -->
<video class="pictrue" :src="formData.video_link"></video>
<!--#endif-->
<image class="video-bg" mode="widthFix"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png">
@ -69,7 +69,7 @@
</view>
</view>
<view class="release_item">
<!-- <view class='item acea-row row-between-wrapper'>
<view class='item acea-row row-between-wrapper'>
<view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})</view>
<view class="select">
<view class="select_count" @click.stop="addProduct">
@ -81,7 +81,7 @@
<text class="iconfont icon-xiangyou"></text>
</view>
</view>
</view> -->
</view>
<view class='item acea-row row-between-wrapper'>
<view class='name'><text class="iconfont icon-canyuhuati"></text>参与话题</view>
<view class="select">
@ -581,7 +581,7 @@
line-height: 90rpx;
height: 90rpx;
height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(90rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
height: calc(200rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
}
.container {

49
pages/supply_chains/supply_chains.vue
View File

@ -13,7 +13,7 @@
</swiper>
</view>
<view class="search_wrapper flex_a_c_j_sb">
<!-- <view class="search_wrapper flex_a_c_j_sb">
<navigator url="/pages/plantGrass/plant_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
<view class="flex_a_c">
<view class="iconfont icon-sousuo"></view>
@ -22,14 +22,14 @@
<button class="search_btn">搜索</button>
</navigator>
<view class="iconlihai lihai-gengduo" @click="showPicker=true"></view>
</view>
</view> -->
<view class="shop_wrapper">
<navigator class="l_yun" hover-class="none"
:url="`/pages/nongKe/supply_chain/supplier?street_id=${sotreParam.street_id}`">
:url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${sotreParam.street_id}`">
<view class="yun_title flex_a_c">
<view class="">泸州市{{district}}{{town}}</view>
<view class="iconlihai lihai-gengduo"></view>
<view class="iconlihai lihai-gengduo" @click.stop="showPicker=true"></view>
</view>
<view class="text_cont">
<text class="name_town">{{town}}</text>供销综合云市场
@ -79,14 +79,18 @@
</navigator>
</view> -->
<view class="article_box">
<block v-for="item in ArticleHotList" :key="item.article_id">
<view class="article_item">
<view class="title">{{item.title}}</view>
<view class="synopsis">{{item.synopsis}}</view>
</view>
</block>
</view>
<!-- 滚动 -->
<scroll-view scroll-y="true" class="article_box">
<view>
<block v-for="item in ArticleHotList" :key="item.article_id">
<view class="article_item">
<view class="title">{{item.title}}</view>
<view class="synopsis">{{item.synopsis}}</view>
</view>
</block>
</view>
</scroll-view>
<view class="tabs_wrapper">
<!-- <u-tabs :list="tabsData.list" @click="tabsChange" :activeStyle="tabsData.activeStyle"
@ -277,13 +281,13 @@
},
Area() {
getArea({ city_code: 510500 }).then(res => {
this.$refs.uPicker.setColumnValues(0, res);
this.Street(res[0]['code']);
this.$refs.uPicker.setColumnValues(0, res.data);
this.Street(res.data[0]['code']);
});
},
Street(code) {
getStreet({ area_code: code }).then(res => {
this.$refs.uPicker.setColumnValues(1, res);
this.$refs.uPicker.setColumnValues(1, res.data);
});
},
},
@ -542,12 +546,20 @@
}
}
.scroll_art {
width: 694.74rpx;
margin: 0 auto;
height: 526.32rpx
}
.article_box {
height: 431.58rpx;
width: 694.74rpx;
margin: 38.6rpx auto;
background-color: #fff;
border-radius: 8px;
padding: 24.56rpx;
padding: 0 24.56rpx 24.56rpx 24.56rpx;
box-sizing: border-box;
.article_item {
height: 131.58rpx;
@ -557,16 +569,17 @@
border-bottom: 1px solid #CCCCCC;
.title {
font-size: 31.58rpx;
font-size: 28.07rpx;
font-weight: bold;
width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-bottom: 10.53rpx;
}
.synopsis {
font-size: 24.56rpx;
font-size: 21.05rpx;
color: #666;
width: 100%;
white-space: nowrap;

4
pages/user/index.vue
View File

@ -151,7 +151,7 @@
</block>
</view>
</view>
<view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
<!-- <view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
<view class="item-text">
<view class="title">
<text class="merchant">商家</text>管理
@ -159,7 +159,7 @@
<view class="info">进入商户中心管理店铺</view>
</view>
<view class="image merchant-image"></view>
</view>
</view> -->
<view class="menus-list-item" v-if="!userInfo.service && userInfo.topService" @click="toService(1)">
<view class="item-text">
<view class="title">

1610
pages/users/login/index.vue
View File

File diff suppressed because it is too large Load Diff

1214
pages/users/login/login_copy.vue Normal file
View File

File diff suppressed because it is too large Load Diff

1147
pages/users/user_info/index.vue
View File

File diff suppressed because it is too large Load Diff

2
store/modules/app.js
View File

@ -61,7 +61,7 @@ const mutations = {
state.color = color;
document.body.style.backgroundColor = color;
},
UPDATE_USERINFO(state, userInfo) {
UPDATE_USERINFO(state, userInfo, time) {
userInfo.isNew && Cache.set('is_new_user', '1')
state.userInfo = userInfo;
},

2
uni.scss
View File

@ -13,6 +13,8 @@
*/
@import '@/uni_modules/uview-ui/theme.scss';
/* 颜色变量 */
$uni-theme-color: #F45846;
$uni-theme-bg-color: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
/* 行为相关颜色 */
$uni-color-primary: #007aff;

1741
uni_modules/bt-cropper/components/bt-cropper/bt-cropper.vue
View File

File diff suppressed because it is too large Load Diff