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 getNoticeInfoAPI = (data) => request.get('/Notice/info', data)
export const getArea = (data) => request.get('/city/get_area', data, { noAuth: 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 getStreet = (data) => request.get('city/get_street', data, { noAuth: true })
export const getVillage = (data) => request.get('/city/get_village', 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 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 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() { export function getCartList(data) {
return request.get("user/cart/lst"); return request.get("user/cart/lst", data);
} }
/** /**

24
api/store.js
View File

@ -1,20 +1,18 @@
// +----------------------------------------------------------------------
// | 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"; import request from "@/utils/request.js";
/**
* 添加扫码商品
* @returns {*}
*/
export function addCartApi(data) {
return request.post('v2/micropay/addCart', data);
}
/** /**
* 获取产品详情 * 获取产品详情
* @param int id * @param int id
* *
*/ */
export function getProductDetail(id) { export function getProductDetail(id, data) {
return request.get('store/product/detail/' + id, {}, { return request.get('store/product/detail/' + id, data, {
noAuth: true noAuth: true
}); });
} }
@ -123,7 +121,7 @@ export function getProductHot(page, limit) {
* 获取商户推荐产品 * 获取商户推荐产品
* *
*/ */
export function getMerProductHot(id,data) { export function getMerProductHot(id, data) {
return request.get(`product/spu/recommend`, { return request.get(`product/spu/recommend`, {
page: data.page === undefined ? 1 : data.page, page: data.page === undefined ? 1 : data.page,
limit: data.limit === undefined ? 10 : data.limit, limit: data.limit === undefined ? 10 : data.limit,
@ -462,7 +460,7 @@ export function getStoreTypeApi() {
* *
*/ */
export function arrivalNoticeApi(data) { export function arrivalNoticeApi(data) {
return request.post('store/product/increase_take',data); return request.post('store/product/increase_take', data);
} }
/* /*

16
components/Authorize.vue
View File

@ -49,15 +49,6 @@
</view> </view>
</template> </template>
<script> <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(); const app = getApp();
import Cache from '../utils/cache'; import Cache from '../utils/cache';
import { import {
@ -184,6 +175,13 @@
toLogin(true); toLogin(true);
}, },
getUserProfile() { getUserProfile() {
console.log(11);
toLogin(true);
uni.navigateTo({
url: '/pages/users/login/index'
})
console.log(22);
return
let self = this; let self = this;
Routine.getUserProfile() Routine.getUserProfile()
.then(res => { .then(res => {

21
libs/wechat.js
View File

@ -40,7 +40,7 @@ class AuthWechat {
} }
isAndroid(){ isAndroid() {
let u = navigator.userAgent; let u = navigator.userAgent;
return u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; return u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
} }
@ -107,7 +107,7 @@ class AuthWechat {
} }
// 使用微信内置地图查看位置接口； // 使用微信内置地图查看位置接口；
seeLocation(config){ seeLocation(config) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.wechat().then(wx => { this.wechat().then(wx => {
this.toPromise(wx.openLocation, config).then(res => { this.toPromise(wx.openLocation, config).then(res => {
@ -179,11 +179,12 @@ class AuthWechat {
* @param {Object} code * @param {Object} code
*/ */
auth(code) { auth(code) {
console.log('授权登陆获取token');
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let loginType = Cache.get(LOGINTYPE); let loginType = Cache.get(LOGINTYPE);
commonAuth({ commonAuth({
auth: { auth: {
type:'wechat', type: 'wechat',
auth: { auth: {
code, code,
spread: Cache.get("spread") ?? 0 spread: Cache.get("spread") ?? 0
@ -191,10 +192,10 @@ class AuthWechat {
} }
}).then(res => { }).then(res => {
const data = res.data; const data = res.data;
if(res.data.status == 200){ if (res.data.status == 200) {
store.commit("LOGIN", { store.commit("LOGIN", {
token: data.result.token, token: data.result.token,
time:data.result.exp time: data.result.exp
}); });
store.commit("SETUID", data.result.user.uid); store.commit("SETUID", data.result.user.uid);
store.commit('UPDATE_USERINFO', data.result.user); store.commit('UPDATE_USERINFO', data.result.user);
@ -202,10 +203,10 @@ class AuthWechat {
Cache.clear(STATE_KEY); Cache.clear(STATE_KEY);
loginType && Cache.clear(LOGINTYPE); loginType && Cache.clear(LOGINTYPE);
resolve(); resolve();
}else{ } else {
uni.setStorageSync('auth_token',res.data.result.key); uni.setStorageSync('auth_token', res.data.result.key);
return uni.navigateTo({ return uni.navigateTo({
url:'/pages/users/login/index' url: '/pages/users/login/index'
}) })
} }
}) })
@ -255,7 +256,7 @@ class AuthWechat {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let configDefault = { let configDefault = {
fail(res) { fail(res) {
console.log(res,11111); console.log(res, 11111);
if (that.instance) return reject({ if (that.instance) return reject({
is_ready: true, is_ready: true,
wx: that.instance wx: that.instance
@ -268,7 +269,7 @@ class AuthWechat {
}) })
}, },
success(res) { success(res) {
return resolve(res,2222); return resolve(res, 2222);
} }
}; };
Object.assign(configDefault, config); Object.assign(configDefault, config);

11
pages.json
View File

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

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

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

74
pages/gather/gather.vue
View File

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

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

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

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

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

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

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

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

@ -249,9 +249,7 @@
])), ])),
onReady() {}, onReady() {},
mounted: function() {}, mounted: function() {},
onLoad: function(options) { onLoad: function(options) {},
},
onShow: function() { onShow: function() {
let that = this let that = this
let routes = getCurrentPages(); let routes = getCurrentPages();

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

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

12
pages/plant_release/index.vue
View File

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

35
pages/supply_chains/supply_chains.vue
View File

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

4
pages/user/index.vue
View File

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

1192
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

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

@ -4,20 +4,21 @@
<view class='personal-data'> <view class='personal-data'>
<view class="wrapper" v-if="switchUserInfo.length>0"> <view class="wrapper" v-if="switchUserInfo.length>0">
<view class="title">管理我的账号</view> <view class="title">管理我的账号</view>
<view class="wrapList" > <view class="wrapList">
<view class="item acea-row row-between-wrapper" :class="item.uid === userInfo.uid ? 'on' : ''" <view class="item acea-row row-between-wrapper" :class="item.uid === userInfo.uid ? 'on' : ''"
:style="{ 'background-image': `url(${item.uid == userInfo.uid ? domain+'/static/diy/currentAcc'+keyColor+'.png' : '' })` }" :style="{ 'background-image': `url(${item.uid == userInfo.uid ? domain+'/static/diy/currentAcc'+keyColor+'.png' : '' })` }"
v-for="(item,index) in switchUserInfo" v-for="(item,index) in switchUserInfo" :key="index">
:key="index">
<view class="picTxt acea-row row-between-wrapper"> <view class="picTxt acea-row row-between-wrapper">
<block v-if='item.uid === userInfo.uid'> <block v-if='item.uid === userInfo.uid'>
<view class="pictrue" v-if="!mp_is_new" @click="uploadpic"> <view class="pictrue" v-if="!mp_is_new" @click="uploadpic">
<image :src="item.avatar || '/static/images/f.png'"></image> <image :src="item.avatar || '/static/images/f.png'"></image>
<view v-if="open_update_info != 0" class="radius" ><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view> <view v-if="open_update_info != 0" class="radius"><span
class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
</view> </view>
<button v-if="mp_is_new && open_update_info != 0" class="avatar-box pictrue" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"> <button v-if="mp_is_new && open_update_info != 0" class="avatar-box pictrue" open-type="chooseAvatar"
@chooseavatar="onChooseAvatar">
<image :src="item.avatar || '/static/images/f.png'"></image> <image :src="item.avatar || '/static/images/f.png'"></image>
<view class="radius" ><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view> <view class="radius"><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
</button> </button>
<button v-else-if="mp_is_new && open_update_info == 0" class="avatar-box"> <button v-else-if="mp_is_new && open_update_info == 0" class="avatar-box">
<image :src="item.avatar || '/static/images/f.png'"></image> <image :src="item.avatar || '/static/images/f.png'"></image>
@ -25,7 +26,8 @@
</block> </block>
<view class="pictrue" v-else> <view class="pictrue" v-else>
<image :src="item.avatar || '/static/images/f.png'"></image> <image :src="item.avatar || '/static/images/f.png'"></image>
<view class="radius" v-if="open_update_info != 0"><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view> <view class="radius" v-if="open_update_info != 0"><span
class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
</view> </view>
<view class="text"> <view class="text">
<view class="name line1">{{ item.nickname }}</view> <view class="name line1">{{ item.nickname }}</view>
@ -41,7 +43,7 @@
</view> </view>
</view> </view>
<view class="list" v-else> <view class="list" v-else>
<view class='item acea-row row-between-wrapper' > <view class='item acea-row row-between-wrapper'>
<view>头像</view> <view>头像</view>
<view class="pictrue" v-if="!mp_is_new" @click="uploadpic"> <view class="pictrue" v-if="!mp_is_new" @click="uploadpic">
<image class="avatar" :src="userInfo.avatar || '/static/images/f.png'"></image> <image class="avatar" :src="userInfo.avatar || '/static/images/f.png'"></image>
@ -72,7 +74,8 @@
<navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone"> <navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">
点击绑定手机号<text class="iconfont icon-xiangyou"></text> 点击绑定手机号<text class="iconfont icon-xiangyou"></text>
</navigator> </navigator>
<navigator url="/pages/users/user_modify_phone/index" hover-class="none" class='input acea-row row-between-wrapper' v-else> <navigator url="/pages/users/user_modify_phone/index" hover-class="none"
class='input acea-row row-between-wrapper' v-else>
<input type='text' disabled='true' name='phone' :value='userInfo.phone' class='id'></input> <input type='text' disabled='true' name='phone' :value='userInfo.phone' class='id'></input>
<text class='iconfont icon-you'></text> <text class='iconfont icon-you'></text>
</navigator> </navigator>
@ -86,14 +89,16 @@
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>地址管理</view> <view>地址管理</view>
<navigator url="/pages/users/user_address_list/index" hover-class="none" class='input acea-row row-between-wrapper'> <navigator url="/pages/users/user_address_list/index" hover-class="none"
class='input acea-row row-between-wrapper'>
<input type='text' placeholder="立即前往" disabled='true' class='id'></input> <input type='text' placeholder="立即前往" disabled='true' class='id'></input>
<text class='iconfont icon-you'></text> <text class='iconfont icon-you'></text>
</navigator> </navigator>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>发票管理</view> <view>发票管理</view>
<navigator url="/pages/users/user_invoice_list/index" hover-class="none" class='input acea-row row-between-wrapper'> <navigator url="/pages/users/user_invoice_list/index" hover-class="none"
class='input acea-row row-between-wrapper'>
<input type='text' placeholder="立即前往" disabled='true' class='id'></input> <input type='text' placeholder="立即前往" disabled='true' class='id'></input>
<text class='iconfont icon-you'></text> <text class='iconfont icon-you'></text>
</navigator> </navigator>
@ -169,7 +174,7 @@
version: '' version: ''
}; };
}, },
computed: configMap({open_update_info: 0} ,mapGetters(['isLogin','viewColor','keyColor'])), computed: configMap({ open_update_info: 0 }, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
onLoad() { onLoad() {
if (this.isLogin) { if (this.isLogin) {
this.getUserInfo(); this.getUserInfo();
@ -193,7 +198,7 @@
*/ */
uploadpic: function() { uploadpic: function() {
let that = this; let that = this;
if(that.open_update_info == 0){ if (that.open_update_info == 0) {
return; return;
} }
that.$util.uploadImageOne('upload/image', function(res) { that.$util.uploadImageOne('upload/image', function(res) {
@ -202,16 +207,16 @@
userInfo.avatar = res.data.path; userInfo.avatar = res.data.path;
} }
that.switchUserInfo[that.userIndex] = userInfo; that.switchUserInfo[that.userIndex] = userInfo;
editAvatar({avatar:res.data.path}).then((res)=>{ editAvatar({ avatar: res.data.path }).then((res) => {
that.$util.Tips({ that.$util.Tips({
title:res.message, title: res.message,
}) })
}) })
}); });
}, },
// 修改昵称 // 修改昵称
changeInput(){ changeInput() {
if(this.open_update_info == 0){ if (this.open_update_info == 0) {
return; return;
} }
uni.navigateTo({ uni.navigateTo({
@ -220,12 +225,12 @@
}, },
// 微信头像获取 // 微信头像获取
onChooseAvatar(e) { onChooseAvatar(e) {
const {avatarUrl} = e.detail const { avatarUrl } = e.detail
this.$util.uploadImgs('upload/image', avatarUrl, (res) => { this.$util.uploadImgs('upload/image', avatarUrl, (res) => {
this.userInfo.avatar = res.data.path this.userInfo.avatar = res.data.path
editAvatar({avatar:res.data.path}).then((res)=>{ editAvatar({ avatar: res.data.path }).then((res) => {
that.$util.Tips({ that.$util.Tips({
title:res.message, title: res.message,
}) })
}) })
}, (err) => { }, (err) => {
@ -237,7 +242,7 @@
var that = this; var that = this;
plus.runtime.getProperty(plus.runtime.appid, (info) => { plus.runtime.getProperty(plus.runtime.appid, (info) => {
this.version = info.version; this.version = info.version;
console.log('当前版本：'+ info.version) console.log('当前版本：' + info.version)
}); });
}, },
//#endif //#endif
@ -300,7 +305,7 @@
.then(res => { .then(res => {
that.$store.commit("LOGOUT"); that.$store.commit("LOGOUT");
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index', url: '/pages/home/index',
}); });
}) })
.catch(err => { .catch(err => {
@ -334,22 +339,22 @@
}) })
}, },
/**修改密码*/ /**修改密码*/
changePwd(){ changePwd() {
let that = this; let that = this;
if(that.userInfo.phone){ if (that.userInfo.phone) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/users/user_modify_pwd/index` url: `/pages/users/user_modify_pwd/index`
}) })
}else{ } else {
that.$util.Tips({ that.$util.Tips({
title: '请先绑定手机号' title: '请先绑定手机号'
}); });
} }
}, },
//注销账号 //注销账号
changeCancel(){ changeCancel() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/user_about/index?from='+'the_cancellation_msg' url: '/pages/users/user_about/index?from=' + 'the_cancellation_msg'
}) })
}, },
/** /**
@ -359,7 +364,7 @@
let that = this; let that = this;
getUserInfo().then(res => { getUserInfo().then(res => {
that.$set(that, 'userInfo', res.data); that.$set(that, 'userInfo', res.data);
if(res.data.phone){ if (res.data.phone) {
that.userAcc(); that.userAcc();
} }
}); });
@ -369,10 +374,11 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
html{ html {
-webkit-text-size-adjust:none; -webkit-text-size-adjust: none;
} }
.radius{
.radius {
background-color: white; background-color: white;
width: 35rpx; width: 35rpx;
height: 35rpx; height: 35rpx;
@ -384,45 +390,54 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
.iconfonta{
.iconfonta {
border-radius: 50%; border-radius: 50%;
font-size: 20rpx; font-size: 20rpx;
color: red; color: red;
} }
.avatar { .avatar {
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
border-radius: 50%; border-radius: 50%;
} }
.btnb{
.btnb {
border-radius: 0; border-radius: 0;
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
} }
.btna{
.btna {
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
border-radius: 10rpx 10rpx 0 0; border-radius: 10rpx 10rpx 0 0;
} }
.btnc{
.btnc {
height: 130rpx; height: 130rpx;
line-height: 130rpx; line-height: 130rpx;
border-radius: 0; border-radius: 0;
} }
.personal-data { .personal-data {
padding-bottom: calc(0rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ padding-bottom: calc(0rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
padding-bottom: calc(0rpx + env(safe-area-inset-bottom)); ///兼容 IOS<11.2/ padding-bottom: calc(0rpx + env(safe-area-inset-bottom)); ///兼容 IOS<11.2/
} }
.personal-data .wrapper { .personal-data .wrapper {
margin: 10rpx 0; margin: 10rpx 0;
background-color: #fff; background-color: #fff;
padding: 36rpx 30rpx 13rpx 30rpx; padding: 36rpx 30rpx 13rpx 30rpx;
} }
.personal-data .wrapper .title { .personal-data .wrapper .title {
margin-bottom: 30rpx; margin-bottom: 30rpx;
font-size: 32rpx; font-size: 32rpx;
color: #282828; color: #282828;
} }
.personal-data .wrapper .wrapList .item { .personal-data .wrapper .wrapList .item {
width: 690rpx; width: 690rpx;
height: 160rpx; height: 160rpx;
@ -434,9 +449,11 @@
border: 2rpx solid #f8f8f8; border: 2rpx solid #f8f8f8;
box-sizing: border-box; box-sizing: border-box;
} }
.t-color { .t-color {
color: var(--view-theme); color: var(--view-theme);
} }
.personal-data .wrapper .wrapList .item.on { .personal-data .wrapper .wrapList .item.on {
border-color: var(--view-theme); border-color: var(--view-theme);
border-radius: 20rpx; border-radius: 20rpx;
@ -445,32 +462,39 @@
background-color: var(--view-minorColor); background-color: var(--view-minorColor);
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.personal-data .wrapper .wrapList .item .picTxt { .personal-data .wrapper .wrapList .item .picTxt {
width: 445rpx; width: 445rpx;
} }
.personal-data .wrapper .wrapList .item .picTxt .pictrue { .personal-data .wrapper .wrapList .item .picTxt .pictrue {
width: 96rpx; width: 96rpx;
height: 96rpx; height: 96rpx;
position: relative; position: relative;
} }
.personal-data .wrapper .wrapList .item .picTxt .pictrue image { .personal-data .wrapper .wrapList .item .picTxt .pictrue image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 50%; border-radius: 50%;
} }
.personal-data .wrapper .wrapList .item .picTxt .text { .personal-data .wrapper .wrapList .item .picTxt .text {
width: 325rpx; width: 325rpx;
} }
.personal-data .wrapper .wrapList .item .picTxt .text .name { .personal-data .wrapper .wrapList .item .picTxt .text .name {
width: 100%; width: 100%;
font-size: 30rpx; font-size: 30rpx;
color: #282828; color: #282828;
} }
.personal-data .wrapper .wrapList .item .picTxt .text .phone { .personal-data .wrapper .wrapList .item .picTxt .text .phone {
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
margin-top: 10rpx; margin-top: 10rpx;
} }
.personal-data .wrapper .wrapList .item .bnt { .personal-data .wrapper .wrapList .item .bnt {
font-size: 24rpx; font-size: 24rpx;
background-color: #fff; background-color: #fff;
@ -479,6 +503,7 @@
height: 54rpx; height: 54rpx;
border: 2rpx solid var(--view-theme); border: 2rpx solid var(--view-theme);
} }
.personal-data .wrapper .wrapList .item .currentBnt { .personal-data .wrapper .wrapList .item .currentBnt {
position: absolute; position: absolute;
right: 0; right: 0;
@ -489,10 +514,12 @@
height: 48rpx; height: 48rpx;
border-radius: 0 20rpx 0 20rpx; border-radius: 0 20rpx 0 20rpx;
} }
.personal-data .list { .personal-data .list {
margin-top: 15rpx; margin-top: 15rpx;
background-color: #fff; background-color: #fff;
} }
.personal-data .list .item { .personal-data .list .item {
padding: 30rpx 30rpx 30rpx 0; padding: 30rpx 30rpx 30rpx 0;
border-bottom: 1px solid #f2f2f2; border-bottom: 1px solid #f2f2f2;
@ -500,6 +527,7 @@
font-size: 32rpx; font-size: 32rpx;
color: #282828; color: #282828;
} }
.personal-data .list .item .phone { .personal-data .list .item .phone {
width: 160rpx; width: 160rpx;
height: 56rpx; height: 56rpx;
@ -508,26 +536,32 @@
line-height: 56rpx; line-height: 56rpx;
border-radius: 32rpx border-radius: 32rpx
} }
.personal-data .list .item .pictrue { .personal-data .list .item .pictrue {
width: 88rpx; width: 88rpx;
height: 88rpx; height: 88rpx;
} }
.personal-data .list .item .pictrue image { .personal-data .list .item .pictrue image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 50%; border-radius: 50%;
} }
.personal-data .list .item .input { .personal-data .list .item .input {
min-width: 415rpx; min-width: 415rpx;
text-align: right; text-align: right;
color: #868686; color: #868686;
} }
.personal-data .list .item .input .id { .personal-data .list .item .input .id {
width: 365rpx; width: 365rpx;
} }
.personal-data .list .item .input .iconfont { .personal-data .list .item .input .iconfont {
font-size: 35rpx; font-size: 35rpx;
} }
.personal-data .modifyBnt { .personal-data .modifyBnt {
font-size: 32rpx; font-size: 32rpx;
color: #fff; color: #fff;
@ -539,6 +573,7 @@
margin: 76rpx auto 0 auto; margin: 76rpx auto 0 auto;
background: var(--view-theme); background: var(--view-theme);
} }
.personal-data .logOut { .personal-data .logOut {
font-size: 32rpx; font-size: 32rpx;
text-align: center; text-align: center;
@ -549,10 +584,12 @@
color: var(--view-theme); color: var(--view-theme);
border: 1px solid var(--view-theme); border: 1px solid var(--view-theme);
} }
.avatar-box { .avatar-box {
width: 96rpx; width: 96rpx;
height: 96rpx; height: 96rpx;
background: transparent; background: transparent;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;

2
store/modules/app.js
View File

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

2
uni.scss
View File

@ -13,6 +13,8 @@
*/ */
@import '@/uni_modules/uview-ui/theme.scss'; @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; $uni-color-primary: #007aff;

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

@ -153,9 +153,9 @@
default: false default: false
}, },
// 是否开启操作结束后自动放大 // 是否开启操作结束后自动放大
autoZoom:{ autoZoom: {
type:Boolean, type: Boolean,
default:true default: true
} }
}, },
data() { data() {
@ -197,7 +197,7 @@
handler(imageSrc) { handler(imageSrc) {
this.imageUrl = imageSrc this.imageUrl = imageSrc
this.imageInfo = null; this.imageInfo = null;
if(!imageSrc){ if (!imageSrc) {
return return
} }
this.getImageInfo(imageSrc).then(imageInfo => { this.getImageInfo(imageSrc).then(imageInfo => {
@ -213,23 +213,22 @@
return this.imageBoundingRect; return this.imageBoundingRect;
}).then((imageBoundingRect) => { }).then((imageBoundingRect) => {
if (this.initPosition) { if (this.initPosition) {
const {left,top,width,height} = this.initPosition const { left, top, width, height } = this.initPosition
const ratio = this.imageBoundingRect.width / this.imageInfo.width const ratio = this.imageBoundingRect.width / this.imageInfo.width
if(left!==undefined){ if (left !== undefined) {
const imgTranslateX = this.cropperPosition.left - imageBoundingRect.left - left * ratio const imgTranslateX = this.cropperPosition.left - imageBoundingRect.left - left * ratio
this.cropperPosition.left -= imgTranslateX this.cropperPosition.left -= imgTranslateX
} }
if(top!==undefined){ if (top !== undefined) {
const imgTranslateY = this.cropperPosition.top - imageBoundingRect.top - top * ratio const imgTranslateY = this.cropperPosition.top - imageBoundingRect.top - top * ratio
this.cropperPosition.top -= imgTranslateY this.cropperPosition.top -= imgTranslateY
} }!!width && (this.cropperPosition.width = this.initPosition.width * ratio);
!!width && (this.cropperPosition.width = this.initPosition.width * ratio);
!!height && (this.cropperPosition.height = this.initPosition.height * ratio); !!height && (this.cropperPosition.height = this.initPosition.height * ratio);
} }
this.$emit('load') this.$emit('load')
}).catch(err=>{ }).catch(err => {
console.error('失败信息',err) console.error('失败信息', err)
this.$emit('loadFail',err) this.$emit('loadFail', err)
}) })
}, },
immediate: true immediate: true
@ -424,8 +423,8 @@
/** /**
* @deprecated 本方法已弃用，请用resetCropper代替 * @deprecated 本方法已弃用，请用resetCropper代替
*/ */
resetRatio(){ resetRatio() {
log('本方法(resetRatio)已弃用,未来将删除,请用resetCropper代替','warn') log('本方法(resetRatio)已弃用,未来将删除,请用resetCropper代替', 'warn')
return this.resetCropper() return this.resetCropper()
}, },
// 重置裁剪框 // 重置裁剪框
@ -458,9 +457,9 @@
onTouchEnd() { onTouchEnd() {
startTouches = [] startTouches = []
this.checkImagePosition() this.checkImagePosition()
if(this.autoZoom){ if (this.autoZoom) {
clearTimeout(timer) clearTimeout(timer)
timer = setTimeout(this.zoom,1000) timer = setTimeout(this.zoom, 1000)
} }
this.reportChange() this.reportChange()
}, },
@ -501,7 +500,7 @@
this.imgTranslateY = this.imgTranslateY + (cropperPosition.bottom - imagePosition.bottom) this.imgTranslateY = this.imgTranslateY + (cropperPosition.bottom - imagePosition.bottom)
} }
}, },
zoom(){ zoom() {
// 容器比例 // 容器比例
const containerRatio = this.containerRect.width / this.containerRect.height const containerRatio = this.containerRect.width / this.containerRect.height
// 移动后的裁剪框比例 // 移动后的裁剪框比例
@ -542,7 +541,7 @@
reportChange() { reportChange() {
const imagePosition = this.getImagePosition() const imagePosition = this.getImagePosition()
const cropperPosition = this.getCropperPosition() const cropperPosition = this.getCropperPosition()
const scale = this.imageBoundingRect.width/this.imageInfo.width * this.imgScale const scale = this.imageBoundingRect.width / this.imageInfo.width * this.imgScale
this.$emit('change', { this.$emit('change', {
left: (cropperPosition.left - imagePosition.left) / scale, left: (cropperPosition.left - imagePosition.left) / scale,
top: (cropperPosition.top - imagePosition.top) / scale, top: (cropperPosition.top - imagePosition.top) / scale,
@ -755,6 +754,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./iconfont.css"; @import "./iconfont.css";
.bt-container { .bt-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -765,6 +765,7 @@
padding-top: 30rpx; padding-top: 30rpx;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
.iconfont { .iconfont {
position: absolute; position: absolute;
z-index: 999; z-index: 999;
@ -774,16 +775,20 @@
background-color: rgba(255, 255, 255, 0.2); background-color: rgba(255, 255, 255, 0.2);
border-radius: 50%; border-radius: 50%;
color: #FFFFFF; color: #FFFFFF;
&.active { &.active {
color: #007AFF; color: #007AFF;
} }
} }
.icon-move { .icon-move {
right: 100rpx; right: 100rpx;
} }
.icon-reset { .icon-reset {
right: 40rpx; right: 40rpx;
} }
.bt-canvas { .bt-canvas {
position: absolute; position: absolute;
left: 100%; left: 100%;
@ -791,25 +796,30 @@
width: 300px; width: 300px;
height: 300px; height: 300px;
} }
.mainContent { .mainContent {
flex: 1; flex: 1;
margin: 60rpx 60rpx 150rpx; margin: 60rpx 60rpx 150rpx;
position: relative; position: relative;
.image { .image {
position: absolute; position: absolute;
will-change: transform; will-change: transform;
transform-origin: center center; transform-origin: center center;
} }
.controller { .controller {
position: absolute; position: absolute;
z-index: 99; z-index: 99;
padding: 20rpx; padding: 20rpx;
&::after { &::after {
display: block; display: block;
content: ''; content: '';
box-shadow: 0 0 10rpx #333; box-shadow: 0 0 10rpx #333;
background-color: #E4E7ED; background-color: #E4E7ED;
} }
&.controller_dot { &.controller_dot {
&::after { &::after {
width: 40rpx; width: 40rpx;
@ -817,12 +827,14 @@
border-radius: 99px; border-radius: 99px;
} }
} }
&.vertical { &.vertical {
&::after { &::after {
width: 10rpx; width: 10rpx;
height: 40rpx; height: 40rpx;
} }
} }
&.horizon { &.horizon {
&::after { &::after {
width: 40rpx; width: 40rpx;
@ -830,6 +842,7 @@
} }
} }
} }
.cropper { .cropper {
position: absolute; position: absolute;
border: 1px solid #eee; border: 1px solid #eee;
@ -839,40 +852,48 @@
will-change: transform; will-change: transform;
display: contain; display: contain;
pointer-events: none; pointer-events: none;
.line { .line {
position: absolute; position: absolute;
// background-color: #eee; // background-color: #eee;
} }
.row { .row {
width: 100%; width: 100%;
height: 0px; height: 0px;
left: 0; left: 0;
border-top: 1px dashed #007AFF; border-top: 1px dashed #007AFF;
} }
.col { .col {
height: 100%; height: 100%;
width: 0px; width: 0px;
border-left: 1px dashed #007AFF; border-left: 1px dashed #007AFF;
} }
.row1 { .row1 {
top: 33%; top: 33%;
} }
.row2 { .row2 {
top: 66%; top: 66%;
} }
.col1 { .col1 {
left: 33%; left: 33%;
} }
.col2 { .col2 {
left: 66%; left: 66%;
} }
} }
} }
.slot { .slot {
position: fixed; position: fixed;
width: 100%; width: 100%;
left: 0; left: 0;
bottom: 0; bottom: 131.58rpx;
height: 90rpx; height: 90rpx;
height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(90rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ height: calc(90rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/