更新
This commit is contained in:
parent
b474f76a62
commit
d2b0a07ba7
@ -261,4 +261,66 @@ export function spuTopList(data) {
|
|||||||
return request.get(`product/spu/get_hot_ranking`, data, {
|
return request.get(`product/spu/get_hot_ranking`, data, {
|
||||||
noAuth: true
|
noAuth: true
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 活动列表
|
||||||
|
export function consumption(data) {
|
||||||
|
return request.get(`storeActivity/consumption`, data, {
|
||||||
|
noAuth: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 参加活动
|
||||||
|
export function chooseConsumption(data) {
|
||||||
|
return request.post(`storeActivity/choose`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 拉新补贴活动完成状态
|
||||||
|
export function storeActivityStatus(data) {
|
||||||
|
return request.get(`storeActivity/status`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 领取补贴
|
||||||
|
export function storeActivityReceive(data) {
|
||||||
|
return request.post(`storeActivity/receive`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 拉新补贴活动完成状态
|
||||||
|
export function storeActivityRecord(data) {
|
||||||
|
return request.get(`storeActivity/record`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 补贴余额统计
|
||||||
|
export function storeActivityTotal(data) {
|
||||||
|
return request.get(`storeActivity/total`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// 活动商品专区
|
||||||
|
export function storeActivityProduct(data) {
|
||||||
|
return request.get(`storeActivity/product`, data, {
|
||||||
|
noAuth: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 活动区域列表
|
||||||
|
export function storeActivityDistrict(data) {
|
||||||
|
return request.get(`storeActivity/district`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
//邀请好友列表
|
||||||
|
export function qrcode(data) {
|
||||||
|
return request.get(`qrcode`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// 生成二维码
|
||||||
|
export function merchantRecord(data) {
|
||||||
|
return request.get(`merchantRecord`, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// 生成二维码
|
||||||
|
export function mer_services_agree() {
|
||||||
|
return request.get(`agreement/mer_services_agree`);
|
||||||
}
|
}
|
39
api/store.js
39
api/store.js
@ -395,6 +395,14 @@ export function getHotBanner(type) {
|
|||||||
export function create(data) {
|
export function create(data) {
|
||||||
return request.post("intention/create", data);
|
return request.post("intention/create", data);
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 种养殖户入驻表单
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
export function personalStore(data) {
|
||||||
|
return request.post("intention/personal_store", data);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 商户入驻短信验证码
|
* 商户入驻短信验证码
|
||||||
* @returns {*}
|
* @returns {*}
|
||||||
@ -593,4 +601,35 @@ export function priceRuleApi(id) {
|
|||||||
return request.get(`store/product/price_rule/${id}`, {}, {
|
return request.get(`store/product/price_rule/${id}`, {}, {
|
||||||
noAuth: true
|
noAuth: true
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function vicinityStoreApi(data) {
|
||||||
|
return request.get(`region/${data}/merchant`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
商家入驻 -- 获取商户入驻申请协议内容
|
||||||
|
*/
|
||||||
|
export function agreeiness(data) {
|
||||||
|
return request.get(`business/agree`, data, {
|
||||||
|
noAuth: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
上传图片识别文字
|
||||||
|
*/
|
||||||
|
export function merchantLicenseIdentify(data) {
|
||||||
|
return request.post(`merchant_license_identify`, data, {
|
||||||
|
noAuth: true
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
从供销平台获取村店铺负责人,联系电话
|
||||||
|
*/
|
||||||
|
export function getVillageInfo(data) {
|
||||||
|
return requestb.get(`shop_call/getVillageCompany`, data, {
|
||||||
|
noAuth: true
|
||||||
|
});
|
||||||
}
|
}
|
@ -2,8 +2,8 @@
|
|||||||
"name" : "惠农生活",
|
"name" : "惠农生活",
|
||||||
"appid" : "__UNI__3A527D1",
|
"appid" : "__UNI__3A527D1",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.4",
|
"versionName" : "2.0.0",
|
||||||
"versionCode" : 127,
|
"versionCode" : 200,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
@ -98,15 +98,15 @@
|
|||||||
onLoad() {
|
onLoad() {
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
// if (this.isLogin) {
|
if (this.isLogin) {
|
||||||
// this.emptyText = '暂无可用应用'
|
this.emptyText = '暂无可用应用'
|
||||||
// this.jurisdiction = false
|
this.jurisdiction = false
|
||||||
// this.initAllAppLet();
|
this.initAllAppLet();
|
||||||
// } else {
|
} else {
|
||||||
// this.emptyText = '请登录'
|
this.emptyText = '请登录'
|
||||||
// this.jurisdiction = true
|
this.jurisdiction = true
|
||||||
// }
|
}
|
||||||
// this.getUserInfo();
|
this.getUserInfo();
|
||||||
},
|
},
|
||||||
onPullDownRefresh() {
|
onPullDownRefresh() {
|
||||||
this.getUserInfo()
|
this.getUserInfo()
|
||||||
@ -304,7 +304,6 @@
|
|||||||
if (!res.data.mer_info) {
|
if (!res.data.mer_info) {
|
||||||
that.$set(this, 'jurisdiction', false);
|
that.$set(this, 'jurisdiction', false);
|
||||||
}
|
}
|
||||||
// console.log(that.userInfoData);
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
61
pages/index/component/card.vue
Normal file
61
pages/index/component/card.vue
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
<template>
|
||||||
|
<view style="padding-top: 15rpx;">
|
||||||
|
<view class="home_list" style="padding-bottom: 0;">
|
||||||
|
<image class="left" @click="go_shop" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_yuncang.webp"></image>
|
||||||
|
<view class="right">
|
||||||
|
<image class="top" @click="navgo(`/pages/nongKe/supply_chain/supplierB?type_id=10,17&street_id=${street_id}&townName=${town}`)" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_shichang.webp"></image>
|
||||||
|
<image class="bottom" @click="navgo('/pages/nongKe/specialty/index?type_code=PersonalStore&street_id='+street_id)" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/home_img/home_my.webp"></image>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'card',
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
};
|
||||||
|
},
|
||||||
|
created() {},
|
||||||
|
mounted() {},
|
||||||
|
methods: {
|
||||||
|
go_shop() {
|
||||||
|
uni.navigateTo({
|
||||||
|
url: `/pages/cloud_warehouse/big_classification/index`
|
||||||
|
})
|
||||||
|
},
|
||||||
|
navgo(url){
|
||||||
|
if(url) uni.navigateTo({
|
||||||
|
url: url
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.home_list{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-around;
|
||||||
|
padding: 10rpx;
|
||||||
|
padding-bottom: 20rpx;
|
||||||
|
padding-top: 0;
|
||||||
|
.left{
|
||||||
|
height: 491rpx;
|
||||||
|
width: 340rpx;
|
||||||
|
}
|
||||||
|
.right{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
.top{
|
||||||
|
width: 390rpx;
|
||||||
|
height: 244rpx;
|
||||||
|
}
|
||||||
|
.bottom{
|
||||||
|
width: 390rpx;
|
||||||
|
height: 244rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
@ -5,6 +5,23 @@
|
|||||||
</view>
|
</view>
|
||||||
<!--搜索-->
|
<!--搜索-->
|
||||||
<view :class="{scrolled:isScrolled}" class="my-main">
|
<view :class="{scrolled:isScrolled}" class="my-main">
|
||||||
|
<view style="height: var(--status-bar-height);"></view>
|
||||||
|
<view class="location">
|
||||||
|
<view class="box flex_a_c_j_sb">
|
||||||
|
<view class="place_wrapper flex_a_c" @click="changeMap">
|
||||||
|
<view class="iconfont icon-weizhi" style="color:#fff;"></view>
|
||||||
|
<view class="town_name">{{street||'定位中' }}</view>
|
||||||
|
</view>
|
||||||
|
<view class="flex_a_c_j_sb">
|
||||||
|
<navigator style="margin-right: 30rpx;" url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
||||||
|
<view class="iconfont icon-saoma" style="color:#fff;"> </view>
|
||||||
|
</navigator>
|
||||||
|
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
||||||
|
<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
|
||||||
|
</navigator>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
<!-- #ifdef H5 -->
|
<!-- #ifdef H5 -->
|
||||||
<view>
|
<view>
|
||||||
<view class="header">
|
<view class="header">
|
||||||
@ -35,10 +52,10 @@
|
|||||||
搜索商品
|
搜索商品
|
||||||
<text class="iconfont icon-xiazai5"></text>
|
<text class="iconfont icon-xiazai5"></text>
|
||||||
</navigator>
|
</navigator>
|
||||||
<navigator class="btn skeleton-rect" url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
<!-- <navigator class="btn skeleton-rect" url="/pages/chat/customer_list/index?type=0" hover-class="none">
|
||||||
<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
|
<view class="iconfont icon-xiaoxi" style="color:#fff;"></view>
|
||||||
<text class="iconnum" v-if="userInfo.total_unread">{{ userInfo.total_unread }}</text>
|
<text class="iconnum" v-if="userInfo.total_unread">{{ userInfo.total_unread }}</text>
|
||||||
</navigator>
|
</navigator> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -48,10 +65,10 @@
|
|||||||
<!-- #ifdef MP || APP-PLUS -->
|
<!-- #ifdef MP || APP-PLUS -->
|
||||||
<view>
|
<view>
|
||||||
<view class="mp-header" id="home">
|
<view class="mp-header" id="home">
|
||||||
<view class="sys-head tui-skeleton" :style="{ height: statusBarHeight }"></view>
|
<!-- <view class="sys-head tui-skeleton" :style="{ height: statusBarHeight }"></view> -->
|
||||||
<view class="serch-box tui-skeleton">
|
<view class="serch-box tui-skeleton">
|
||||||
<view class="serch-wrapper flex">
|
<view class="serch-wrapper flex">
|
||||||
<view v-if="logoConfig || site_logo" class="logo skeleton-rect"><image :src="logoConfig || site_logo" mode="widthFix"></image></view>
|
<!-- <view v-if="logoConfig || site_logo" class="logo skeleton-rect"><image :src="logoConfig || site_logo" mode="widthFix"></image></view> -->
|
||||||
<navigator v-if="hotWords.length > 0" :url="'/pages/columnGoods/goods_search/index?searchVal='+searchVal" :class="(logoConfig || site_logo) ? 'input' : 'uninput'"
|
<navigator v-if="hotWords.length > 0" :url="'/pages/columnGoods/goods_search/index?searchVal='+searchVal" :class="(logoConfig || site_logo) ? 'input' : 'uninput'"
|
||||||
hover-class="none" class="skeleton-rect box">
|
hover-class="none" class="skeleton-rect box">
|
||||||
<view class='swiperTxt'>
|
<view class='swiperTxt'>
|
||||||
@ -78,8 +95,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view :style="'height:'+marTop+'px;'"></view>
|
<view :style="'height:'+(marTop + 10)+'px;'"></view>
|
||||||
<view :style="'height:'+statusBarHeight"></view>
|
<!-- <view :style="'height:'+statusBarHeight"></view> -->
|
||||||
</view>
|
</view>
|
||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
<!--选项卡-->
|
<!--选项卡-->
|
||||||
@ -97,6 +114,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<!--轮播图-->
|
<!--轮播图-->
|
||||||
<view class="swiperBg" :style="{ marginTop: swiperTop+'px'}">
|
<view class="swiperBg" :style="{ marginTop: swiperTop+'px'}">
|
||||||
|
<view style="height: 50rpx;"></view>
|
||||||
<block>
|
<block>
|
||||||
<view class="swiper page_swiper" v-if="imgUrls.length">
|
<view class="swiper page_swiper" v-if="imgUrls.length">
|
||||||
<swiper
|
<swiper
|
||||||
@ -208,6 +226,7 @@
|
|||||||
isCategory: false,
|
isCategory: false,
|
||||||
swiperTop: 0,
|
swiperTop: 0,
|
||||||
isFixed: true,
|
isFixed: true,
|
||||||
|
street: ''
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@ -362,6 +381,13 @@
|
|||||||
}
|
}
|
||||||
.my-main{
|
.my-main{
|
||||||
// transition: background-color .5s ease;
|
// transition: background-color .5s ease;
|
||||||
|
.location{
|
||||||
|
padding: 10rpx 28rpx 0 28rpx;
|
||||||
|
.town_name{
|
||||||
|
color: #fff;
|
||||||
|
margin-left: 18rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.swiperTxt {
|
.swiperTxt {
|
||||||
width: 300rpx;
|
width: 300rpx;
|
||||||
@ -451,7 +477,8 @@
|
|||||||
.serch-wrapper {
|
.serch-wrapper {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 0 50rpx 20rpx 30rpx;
|
// padding: 0 50rpx 20rpx 30rpx;
|
||||||
|
padding: 0 28rpx;
|
||||||
height: 76rpx;
|
height: 76rpx;
|
||||||
.logo {
|
.logo {
|
||||||
width: 133rpx;
|
width: 133rpx;
|
||||||
@ -557,14 +584,18 @@
|
|||||||
left: 0;
|
left: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background: #fff!important;
|
// background: #fff!important;
|
||||||
|
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/23bd9202402271611232730.png');
|
||||||
|
background-color: #f1f1f1; /* 设置背景色 */
|
||||||
|
background-size: 100% 100%; /* 让背景图片铺满整个盒子 */
|
||||||
|
background-repeat: no-repeat; /* 不重复 */
|
||||||
transition: background-color .5s ease;
|
transition: background-color .5s ease;
|
||||||
.longItem,.click,.category text{
|
.longItem,.click,.category text{
|
||||||
color: #000000!important;
|
color: #000000!important;
|
||||||
}
|
}
|
||||||
.navTabBox,.mp-header,.header{
|
.navTabBox,.mp-header,.header{
|
||||||
// transition: background-color .5s ease;
|
// transition: background-color .5s ease;
|
||||||
background: #ffffff;
|
// background: #ffffff;
|
||||||
}
|
}
|
||||||
.btn .iconfont{
|
.btn .iconfont{
|
||||||
color: #333333!important;
|
color: #333333!important;
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
<block>
|
<block>
|
||||||
<!-- #ifdef H5 -->
|
<!-- #ifdef H5 -->
|
||||||
<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled" @changeDiy="changeDiy"></homeComb>
|
<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled" @changeDiy="changeDiy"></homeComb>
|
||||||
|
<card></card>
|
||||||
<view v-for="(item, index) in styleConfig" :key="index">
|
<view v-for="(item, index) in styleConfig" :key="index">
|
||||||
<block v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
|
<block v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
|
||||||
<component
|
<component
|
||||||
@ -57,6 +58,7 @@
|
|||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
<!-- #ifdef MP || APP-PLUS -->
|
<!-- #ifdef MP || APP-PLUS -->
|
||||||
<homeComb class="home-comb" v-if="smallPage" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
|
<homeComb class="home-comb" v-if="smallPage" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
|
||||||
|
<card></card>
|
||||||
<block v-for="(item, index) in styleConfig" :key="index" >
|
<block v-for="(item, index) in styleConfig" :key="index" >
|
||||||
<view v-show="navIndex == 0">
|
<view v-show="navIndex == 0">
|
||||||
<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
|
<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
|
||||||
@ -281,6 +283,7 @@ import { getProductslist, getProductHot, storeCategory } from '@/api/store.js';
|
|||||||
import { initiateAssistApi } from '@/api/activity.js';
|
import { initiateAssistApi } from '@/api/activity.js';
|
||||||
import { setVisit, spread } from '@/api/user.js';
|
import { setVisit, spread } from '@/api/user.js';
|
||||||
import recommend from '@/components/recommend';
|
import recommend from '@/components/recommend';
|
||||||
|
import card from './component/card';
|
||||||
// #ifndef H5
|
// #ifndef H5
|
||||||
import passwordPopup from '@/components/passwordPopup';
|
import passwordPopup from '@/components/passwordPopup';
|
||||||
// #endif
|
// #endif
|
||||||
@ -327,6 +330,7 @@ export default {
|
|||||||
components: {
|
components: {
|
||||||
easyLoadimage,
|
easyLoadimage,
|
||||||
recommend,
|
recommend,
|
||||||
|
card,
|
||||||
customTab,
|
customTab,
|
||||||
// #ifndef H5
|
// #ifndef H5
|
||||||
passwordPopup,
|
passwordPopup,
|
||||||
@ -1722,4 +1726,6 @@ page {
|
|||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
@ -571,6 +571,19 @@
|
|||||||
value: 4,
|
value: 4,
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
// 底部菜单
|
||||||
|
tabs3: [
|
||||||
|
{
|
||||||
|
icon: 'icon-gouwu_o',
|
||||||
|
name: '商品',
|
||||||
|
value: 3,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: 'icon-yingyongAPP_o',
|
||||||
|
name: '分类',
|
||||||
|
value: 2,
|
||||||
|
}
|
||||||
|
],
|
||||||
tabs: [],
|
tabs: [],
|
||||||
storeScroll: true,
|
storeScroll: true,
|
||||||
storeTop: 0,
|
storeTop: 0,
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -42,34 +42,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<view class="item">
|
|
||||||
<view class="acea-row row-middle">
|
|
||||||
<text class="item-name">联系电话</text>
|
|
||||||
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
|
|
||||||
@input="validateBtn" placeholder-class='placeholder' />
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="item rel">
|
|
||||||
<view class="acea-row row-middle">
|
|
||||||
<text class="item-name">验证码</text>
|
|
||||||
<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
|
|
||||||
@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
|
|
||||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
|
|
||||||
@click="handleVerify">
|
|
||||||
{{ text }}
|
|
||||||
</button>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="item" v-if="isShowCode">
|
|
||||||
<view class="acea-row row-middle">
|
|
||||||
<text class="item-name">验证码</text>
|
|
||||||
<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
|
|
||||||
@input="validateBtn" placeholder-class='placeholder' />
|
|
||||||
<view class="imageCode" @click="again">
|
|
||||||
<image :src="codeUrl" />
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<!-- <view class="item">
|
<!-- <view class="item">
|
||||||
<view class="uni-list">
|
<view class="uni-list">
|
||||||
<view class="uni-list-cell">
|
<view class="uni-list-cell">
|
||||||
@ -128,6 +101,35 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="item">
|
||||||
|
<view class="acea-row row-middle">
|
||||||
|
<text class="item-name">联系电话</text>
|
||||||
|
<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
|
||||||
|
@input="validateBtn" placeholder-class='placeholder' />
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="item rel">
|
||||||
|
<view class="acea-row row-middle">
|
||||||
|
<text class="item-name">验证码</text>
|
||||||
|
<input type="text" placeholder="填写验证码" v-model="merchantData.yanzhengma"
|
||||||
|
@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
|
||||||
|
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
|
||||||
|
@click="handleVerify">
|
||||||
|
{{ text }}
|
||||||
|
</button>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="item" v-if="isShowCode">
|
||||||
|
<view class="acea-row row-middle">
|
||||||
|
<text class="item-name">验证码</text>
|
||||||
|
<input type="text" placeholder="请输入验证码" class="codeIput" v-model="codeVal"
|
||||||
|
@input="validateBtn" placeholder-class='placeholder' />
|
||||||
|
<view class="imageCode" @click="again">
|
||||||
|
<image :src="codeUrl" />
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
<!-- <view class="item no-border">
|
<!-- <view class="item no-border">
|
||||||
<checkbox-group @change='ChangeIsAgree'>
|
<checkbox-group @change='ChangeIsAgree'>
|
||||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
|
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
|
||||||
|
@ -174,7 +174,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>管理
|
||||||
@ -215,7 +215,7 @@
|
|||||||
<view class="image plantform-image"
|
<view class="image plantform-image"
|
||||||
:style="{'background-image':`url(${domain}/static/images/plantform-image.png)`}"></view>
|
:style="{'background-image':`url(${domain}/static/images/plantform-image.png)`}"></view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
@ -226,10 +226,10 @@
|
|||||||
<view class="">增值电信营业许可证号:川B2-20221250</view>
|
<view class="">增值电信营业许可证号:川B2-20221250</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view v-else class="copy-right">
|
<!-- <view v-else class="copy-right">
|
||||||
<view class="iconfont icon-crmeb"></view>
|
<view class="iconfont icon-crmeb"></view>
|
||||||
<view class="text">众邦科技提供技术支持</view>
|
<view class="text">众邦科技提供技术支持</view>
|
||||||
</view>
|
</view> -->
|
||||||
|
|
||||||
<!-- <view v-if="copyright.status !== -1" class="copy-right">
|
<!-- <view v-if="copyright.status !== -1" class="copy-right">
|
||||||
<image class="img-copyright" :src="copyright.image" mode="widthFix"></image>
|
<image class="img-copyright" :src="copyright.image" mode="widthFix"></image>
|
||||||
|
@ -208,10 +208,14 @@
|
|||||||
let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
|
let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
|
||||||
.data.village
|
.data.village
|
||||||
];
|
];
|
||||||
|
console.log({...res.data});
|
||||||
that.$set(that, 'userAddress', res.data);
|
that.$set(that, 'userAddress', res.data);
|
||||||
that.$set(that, 'region', region);
|
that.$set(that, 'region', region);
|
||||||
that.city_id = res.data.city_id
|
that.city_id = res.data.city_id
|
||||||
that.addressInfo = res.data.areas
|
if(res.data.areas) that.addressInfo = res.data.areas;
|
||||||
|
else {
|
||||||
|
|
||||||
|
}
|
||||||
that.villageInfo = [res.data.brigade]
|
that.villageInfo = [res.data.brigade]
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<view class='nav acea-row'>
|
<view class='nav acea-row'>
|
||||||
<view class='item' :class='type==0 ? "on":""' @click='changeType(0)'>全部</view>
|
<view class='item' :class='type==0 ? "on":""' @click='changeType(0)'>全部</view>
|
||||||
<view class='item' :class='type==1 ? "on":""' @click='changeType(1)'>消费</view>
|
<view class='item' :class='type==1 ? "on":""' @click='changeType(1)'>消费</view>
|
||||||
<view class='item' :class='type==2 ? "on":""' @click='changeType(2)'>充值</view>
|
<!-- <view class='item' :class='type==2 ? "on":""' @click='changeType(2)'>充值</view> -->
|
||||||
</view>
|
</view>
|
||||||
<view class='sign-record'>
|
<view class='sign-record'>
|
||||||
<view class='list' v-for="(item,index) in userBillList" :key="index">
|
<view class='list' v-for="(item,index) in userBillList" :key="index">
|
||||||
|
@ -10,18 +10,18 @@
|
|||||||
<view class='money'>{{userInfo.now_money || 0}}</view>
|
<view class='money'>{{userInfo.now_money || 0}}</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- #ifdef APP-PLUS || H5 -->
|
<!-- #ifdef APP-PLUS || H5 -->
|
||||||
<navigator v-if="recharge_switch == 1" url="/pages/users/user_payment/index" hover-class="none" class='recharge t-color'>充值</navigator>
|
<!-- <navigator v-if="recharge_switch == 1" url="/pages/users/user_payment/index" hover-class="none" class='recharge t-color'>充值</navigator> -->
|
||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
<!-- #ifdef MP -->
|
<!-- #ifdef MP -->
|
||||||
<view v-if="recharge_switch == 1" @click="openSubscribe('/pages/users/user_payment/index')" class='recharge t-color'>充值</view>
|
<!-- <view v-if="recharge_switch == 1" @click="openSubscribe('/pages/users/user_payment/index')" class='recharge t-color'>充值</view> -->
|
||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
</view>
|
</view>
|
||||||
<view class='cumulative acea-row row-top'>
|
<view class='cumulative acea-row row-top'>
|
||||||
<!-- v-if="balance_func_status == 1" -->
|
<!-- v-if="balance_func_status == 1" -->
|
||||||
<view class='item' >
|
<!-- <view class='item' >
|
||||||
<view>累计充值(元)</view>
|
<view>累计充值(元)</view>
|
||||||
<view class='money'>{{userInfo.total_recharge || 0}}</view>
|
<view class='money'>{{userInfo.total_recharge || 0}}</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class='item'>
|
<view class='item'>
|
||||||
<view>累计消费(元)</view>
|
<view>累计消费(元)</view>
|
||||||
<view class='money'>{{userInfo.total_consume || 0}}</view>
|
<view class='money'>{{userInfo.total_consume || 0}}</view>
|
||||||
@ -42,12 +42,12 @@
|
|||||||
</view>
|
</view>
|
||||||
<view>消费记录</view>
|
<view>消费记录</view>
|
||||||
</navigator>
|
</navigator>
|
||||||
<navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=2'>
|
<!-- <navigator class='item' hover-class='none' url='/pages/users/user_bill/index?type=2'>
|
||||||
<view class='pictrue'>
|
<view class='pictrue'>
|
||||||
<image :src="domain+'/static/diy/record3'+keyColor+'.png'"></image>
|
<image :src="domain+'/static/diy/record3'+keyColor+'.png'"></image>
|
||||||
</view>
|
</view>
|
||||||
<view>充值记录</view>
|
<view>充值记录</view>
|
||||||
</navigator>
|
</navigator> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
|
<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
|
||||||
|
@ -20,6 +20,7 @@ import {
|
|||||||
} from '../../config/cache';
|
} from '../../config/cache';
|
||||||
|
|
||||||
const state = {
|
const state = {
|
||||||
|
location: Cache.get('LOCATION_DATA', true) || {},
|
||||||
token: Cache.get(LOGIN_STATUS) || null,
|
token: Cache.get(LOGIN_STATUS) || null,
|
||||||
uuid: uni.getStorageSync('uuid') || "",
|
uuid: uni.getStorageSync('uuid') || "",
|
||||||
backgroundColor: "#fff",
|
backgroundColor: "#fff",
|
||||||
@ -34,11 +35,19 @@ const state = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const mutations = {
|
const mutations = {
|
||||||
|
setLocation(state, data) {
|
||||||
|
state.location = data
|
||||||
|
Cache.set('LOCATION_DATA', data);
|
||||||
|
},
|
||||||
LOGIN(state, opt) {
|
LOGIN(state, opt) {
|
||||||
state.token = opt.token;
|
state.token = opt.token;
|
||||||
Cache.set(LOGIN_STATUS, opt.token, opt.time);
|
Cache.set(LOGIN_STATUS, opt.token, opt.time);
|
||||||
uni.removeStorageSync('auth_token');
|
uni.removeStorageSync('auth_token');
|
||||||
},
|
},
|
||||||
|
SET_USERINFO(state, opt){
|
||||||
|
state.userInfo = opt;
|
||||||
|
Cache.set(USER_INFO, opt);
|
||||||
|
},
|
||||||
SETUID(state,val){
|
SETUID(state,val){
|
||||||
state.uid = val;
|
state.uid = val;
|
||||||
Cache.set(UID, val);
|
Cache.set(UID, val);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user