zm/nuttyreading-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: zm:xie_fangji
Branches Tags
zm:master zm:restore2 zm:index_tag zm:xie1206 zm:xie_fangji zm:xie_tiangandizhi zm:xulu-visitor zm:appJump zm:xie_wuyunliuqi zm:xie_quhao zm:xie_xuewei zm:xie_address zm:xie1023 zm:xie1010 zm:xie0928 zm:liqian0909 zm:guonei zm:turnjs zm:liqian0908
...
pull from: zm:xie_quhao
Branches Tags
zm:restore2 zm:master zm:index_tag zm:xie1206 zm:xie_fangji zm:xie_tiangandizhi zm:xulu-visitor zm:appJump zm:xie_wuyunliuqi zm:xie_quhao zm:xie_xuewei zm:xie_address zm:xie1023 zm:xie1010 zm:xie0928 zm:liqian0909 zm:guonei zm:turnjs zm:liqian0908

7 Commits
xie_fangji ... xie_quhao

Author SHA1 Message Date
@fawn-nine
5277ab3f5b 境外短信验证登陆 2023-11-14 18:08:16 +08:00
@fawn-nine
1172043635 地址bug修复 2023-11-14 14:21:11 +08:00
@fawn-nine
3b57f0aeb0 Merge branch 'xie1108' 2023-11-14 11:28:53 +08:00
@fawn-nine
890a3c45ad 隐藏首页未开发项目 2023-11-14 11:28:14 +08:00
@fawn-nine
c50dfc0bd5 . 2023-11-14 09:39:58 +08:00
@fawn-nine
52f7ad40c8 开启统计，ios开启app分享 2023-11-13 13:55:16 +08:00
@fawn-nine
7db05c39fa 首页布局压缩 2023-11-10 17:44:41 +08:00
17 changed files with 318 additions and 268 deletions
Expand all files Collapse all files

9
config/baseUrl.js
View File

@@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/"; // socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/"; // baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "http://59.110.212.44:9200/pb/"; // baseUrl = "http://59.110.212.44:9200/pb/";
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
baseUrl = "https://api.nuttyreading.com/"; // 线上正式 // baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
// baseUrl = "http://192.168.110.110:9200/pb/"; // baseUrl = "http://192.168.110.110:9200/pb/";
// baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1 // baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1
@@ -45,9 +45,10 @@ const courtConfig = {
} }
}; };
//手机号验证正则表达式 //手机号验证正则表达式
// const phoneRegular = /^1\d{10}$/; // (中国大陆)
const phoneRegular = /^1\d{10}$/;
// 手机号码验证 支持港澳台 大陆 // 手机号码验证 支持港澳台 大陆
const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/; // const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
//邮箱验证正则表达式 //邮箱验证正则表达式
const mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/; const mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/;
//密码验证正则表达式 //密码验证正则表达式

1
config/requestConfig.js
View File

@@ -167,6 +167,7 @@ $http.dataFactory = async function(res) {
title: '登录失效，请重新登录', title: '登录失效，请重新登录',
icon: 'none' icon: 'none'
}); });
console.log('到这里了')
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.navigateTo({
url: "/pages/user/login" url: "/pages/user/login"

66
manifest.json
View File

@@ -12,8 +12,8 @@
"src" : "图片路径" "src" : "图片路径"
} }
], ],
"versionName" : "1.2.13", "versionName" : "1.2.15",
"versionCode" : 1213, "versionCode" : 1215,
"app-plus" : { "app-plus" : {
"compatible" : { "compatible" : {
"ignoreVersion" : true "ignoreVersion" : true
@@ -154,7 +154,10 @@
"splashscreen" : { "splashscreen" : {
"alwaysShowBeforeRender" : false "alwaysShowBeforeRender" : false
}, },
"nativePlugins" : {} "nativePlugins" : {},
"uniStatistics" : {
"enable" : true
}
}, },
// 5+App特有相关 // 5+App特有相关
"quickapp" : {}, "quickapp" : {},
@@ -172,6 +175,9 @@
"scope.userLocation" : { "scope.userLocation" : {
"desc" : "你的位置信息将用于小程序位置接口的效果展示" "desc" : "你的位置信息将用于小程序位置接口的效果展示"
} }
},
"uniStatistics" : {
"enable" : true
} }
}, },
"h5" : { "h5" : {
@@ -184,9 +190,61 @@
"treeShaking" : { "treeShaking" : {
"enable" : true "enable" : true
} }
},
"uniStatistics" : {
"enable" : true
} }
}, },
"_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274" "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
"uniStatistics" : {
"version" : "2",
"enable" : true
},
"mp-alipay" : {
"uniStatistics" : {
"enable" : true
}
},
"mp-baidu" : {
"uniStatistics" : {
"enable" : true
}
},
"mp-jd" : {
"uniStatistics" : {
"enable" : true
}
},
"mp-kuaishou" : {
"uniStatistics" : {
"enable" : true
}
},
"mp-lark" : {
"uniStatistics" : {
"enable" : true
}
},
"mp-qq" : {
"uniStatistics" : {
"enable" : true
}
},
"mp-toutiao" : {
"uniStatistics" : {
"enable" : true
}
},
"quickapp-webview-huawei" : {
"uniStatistics" : {
"enable" : true
}
},
"quickapp-webview-union" : {
"uniStatistics" : {
"enable" : true
}
}
} }
// 小程序特有相关 // 小程序特有相关

77
pages/peanut/home.vue
View File

@@ -3,34 +3,36 @@
<!-- <z-nav-bar backState="2000" title="首页"></z-nav-bar> --> <!-- <z-nav-bar backState="2000" title="首页"></z-nav-bar> -->
<view class="home_bg"> <view class="home_bg">
<view class="" style=" "> <view class="" style=" ">
<view class="icon_hua">
<image src="../../static/icon/home_icon_3.png" mode="aspectFit" class="icon_hua_1"></image> <view class="icon_hua">
</view> <image src="../../static/icon/home_icon_1.png" mode="aspectFit" class="icon_hua_1"></image>
<view class="hehan"> </view>
<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image> <view class="hehan">
</view> <image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
<view class="fiveIcon flexbox" > </view>
<view class="fiveIcon flexbox" style="justify-content: space-around;">
<div class="item item1" @click="onPageJump('../acupoint/acupoint')"> <div class="item item1" @click="onPageJump('../acupoint/acupoint')">
<image src="../../static/icon/five1.png" mode="aspectFit" ></image> <image src="../../static/icon/five1.png" mode="aspectFit" ></image>
<text>经穴检索</text> <text>经穴检索</text>
</div> </div>
<div class="item item1"> <!-- <div class="item item1">
<image src="../../static/icon/five2.png" mode="aspectFit"></image> <image src="../../static/icon/five2.png" mode="aspectFit"></image>
<text>方药检索</text> <text>方药检索</text>
</div> </div> -->
<div class="item item1"> <!-- <div class="item item1">
<image src="../../static/icon/five4.png" mode="aspectFit"></image> <image src="../../static/icon/five4.png" mode="aspectFit"></image>
<text>五运六气</text> <text>五运六气</text>
</div> </div> -->
<div class="item item1" @click="onPageJump('../peanut/searchFor')"> <div class="item item1" @click="onPageJump('../peanut/searchFor')">
<image src="../../static/icon/five3.png" mode="aspectFit"></image> <image src="../../static/icon/five3.png" mode="aspectFit"></image>
<text>书名检索</text> <text>书名检索</text>
</div> </div>
<div class="item item1"> <!-- <div class="item item1">
<image src="../../static/icon/five5.png" mode="aspectFit"></image> <image src="../../static/icon/five5.png" mode="aspectFit"></image>
<text>吴门医述</text> <text>吴门医述</text>
</div> </div> -->
</view> </view>
<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')"> <!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
<view class="search"> <view class="search">
@@ -50,23 +52,23 @@
<!-- <view class="home_nar" v-if="showEbook"> --> <!-- <view class="home_nar" v-if="showEbook"> -->
<view class="home_nar"> <view class="home_nar">
<view class="hn_cl_tit shuguan" @click="onPageJump('../clock/index')"> <view class="hn_cl_tit shuguan" @click="onPageJump('../clock/index')">
<image src="../../static/icon/home1.png" mode="aspectFit"></image> <image src="../../static/icon/home1-1.png" mode="aspectFit"></image>
<!-- <text>打 卡</text> --> <!-- <text>打 卡</text> -->
</view> </view>
<view class="hn_cl_tit dianzishu" @click="onPageJump('../listen/home')"> <view class="hn_cl_tit dianzishu" @click="onPageJump('../listen/home')">
<image src="../../static/icon/home2.png" mode="aspectFit"></image> <image src="../../static/icon/home2-1.png" mode="aspectFit"></image>
<!-- <text>听 书</text> --> <!-- <text>听 书</text> -->
</view> </view>
<!-- <view class="hn_cl_tit" @click="onPageJump('../bookShop/bookShopIndex')"> --> <!-- <view class="hn_cl_tit" @click="onPageJump('../bookShop/bookShopIndex')"> -->
<view class="hn_cl_tit shuping" @click="onPageJump('../comments/commentsList')"> <view class="hn_cl_tit shuping" @click="onPageJump('../comments/commentsList')">
<image src="../../static/icon/home3.png" mode="aspectFit"></image> <image src="../../static/icon/home3-1.png" mode="aspectFit"></image>
<!-- <text>书 评</text> --> <!-- <text>书 评</text> -->
</view> </view>
<view class="hn_cl_tit chaoshi" @click="onPageJump('../talkBook/talkBook')"> <view class="hn_cl_tit chaoshi" @click="onPageJump('../talkBook/talkBook')">
<image src="../../static/icon/home4.png" mode="aspectFit"></image> <image src="../../static/icon/home4-1.png" mode="aspectFit"></image>
<!-- <text>讲 书</text> --> <!-- <text>讲 书</text> -->
</view> </view>
</view> </view>
@@ -125,14 +127,14 @@
</view> </view>
</view> --> </view> -->
<view class="head_line" style="margin-top: -20rpx;"> <view class="head_line" style="background-color: #fff;">
<b></b> <b></b>
<text>新书上市</text> <text>新书上市</text>
<!-- <i @click="onBookMore('New')">查看更多 ></i> --> <!-- <i @click="onBookMore('New')">查看更多 ></i> -->
</view> </view>
<view class="newBook"> <view class="newBook">
<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10"> <scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10" style="margin-top: 0 !important;">
<view :class="['item']" v-for="(item,index) in newBookList" :key="index"> <view :class="['item']" v-for="(item,index) in newBookList" :key="index">
<view class="videoBox" @click="goDetail(item.productId)"> <view class="videoBox" @click="goDetail(item.productId)">
<image v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image> <image v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image>
@@ -727,23 +729,23 @@
.ProTabs{ .ProTabs{
// margin: 20rpx 0; // margin: 20rpx 0;
padding:0 20rpx; padding:0 20rpx;
text{padding: 12rpx 14rpx; font-size: 32rpx; border-radius: 10rpx; overflow: hidden; text{padding: 8rpx 14rpx; font-size: 32rpx; display: inline-block; border-radius: 10rpx; overflow: hidden;
// background-color: #eee; // background-color: #eee;
color: #55aa7f; margin-right: 10rpx;} color: #55aa7f; margin-right: 10rpx;}
text.cur{background-color:#55aa7f ; color: #fff;} text.cur{background-color:#55aa7f ; color: #fff;}
} }
.newBook{margin-top: 20rpx;} // .newBook{margin-top: 10rpx;}
.scroll-view_H{background-color: #fff;white-space: nowrap; .scroll-view_H{background-color: #fff;white-space: nowrap;
padding:10rpx ; } padding:10rpx ; margin-top: 12rpx;}
.scroll-view_H{ .scroll-view_H{
.item { padding: 10rpx; overflow: hidden; display: inline-block; .item { padding: 10rpx; overflow: hidden; display: inline-block; padding-bottom: 0;
width: 180rpx !important; margin-right: 20rpx; border-radius: 10rpx; width: 180rpx !important; margin-right: 20rpx; border-radius: 10rpx;
.videoBox{ .videoBox{
image{display: block; width:150rpx; image{display: block; width:150rpx;
height: 170rpx; height: 170rpx;
} }
} }
.bookName{display: block; margin-top: 20rpx; color: #666; font-size: 24rpx; white-space: nowrap; .bookName{display: block; margin-top: 6rpx; color: #666; font-size: 24rpx; white-space: nowrap;
overflow-x: hidden; overflow: hidden; overflow-x: hidden; overflow: hidden;
text-overflow: ellipsis;} text-overflow: ellipsis;}
} }
@@ -751,7 +753,8 @@
} }
.flexbox{display: flex;} .flexbox{display: flex;}
.head_line { .head_line {
margin: 20rpx 0 0 0; padding-top: 8rpx;
margin: 12rpx 0 0 0;
b { b {
@@ -793,8 +796,8 @@
image{width: 150rpx; height: 80rpx;} image{width: 150rpx; height: 80rpx;}
} }
.icon_hua{width: 100%; text-align: center; display: block; .icon_hua{width: 100%; text-align: center; display: block;
image{width: 150rpx; height: 150rpx; margin: 0 auto;} image{width: 150rpx; height: 150rpx; margin: 0 auto;}
} }
.search_box { margin: 0 auto; margin-top: 20rpx; align-items: center; .search_box { margin: 0 auto; margin-top: 20rpx; align-items: center;
width: calc(100% - 30rpx); margin-top: 0; width: calc(100% - 30rpx); margin-top: 0;
margin-bottom: 20rpx; margin-bottom: 20rpx;
@@ -829,7 +832,9 @@
} }
} }
.home_nar { .home_nar {
margin: 10rpx 20rpx; justify-content: space-between; background-color: #fff;
padding: 20rpx 30rpx;
justify-content: space-between;
display: flex; display: flex;
color: #333; color: #333;
margin-bottom: 0; margin-bottom: 0;
@@ -839,18 +844,18 @@
// .chaoshi{background-color:#fff2d8 ; border: 2px solid #ede6d3; } // .chaoshi{background-color:#fff2d8 ; border: 2px solid #ede6d3; }
// .shuping{ background-color: #d6ffda; border: 2px solid #bae9bf;} // .shuping{ background-color: #d6ffda; border: 2px solid #bae9bf;}
// .shuguan{ background-color:#e3f9f9 ; border: 2px solid #d7eced; } // .shuguan{ background-color:#e3f9f9 ; border: 2px solid #d7eced; }
.hn_cl_tit { padding-bottom: 10rpx; .hn_cl_tit {
// width: 23%; // width: 23%;
width: 31%; width: 31%;
text-align: center; text-align: center;
border-radius: 20rpx ; padding-top: 10rpx; border-radius: 20rpx ;
// line-height: 110upx; // line-height: 110upx;
//display: flex; //display: flex;
align-content: center; align-content: center;
justify-content: center; justify-content: center;
image { image {
width:90%; width:120rpx;
height:156rpx; height:120rpx;
display: block; display: block;
margin: 0 auto; margin: 0 auto;
// margin: 0 20rpx; // margin: 0 20rpx;
@@ -1119,13 +1124,13 @@
.goods { .goods {
width: 100%; width: 100%;
margin:18rpx 0 50rpx 0; margin:0 0 50rpx 0; background-color: #fff;
.goodsItem { .goodsItem {
display: inline-block; display: inline-block;
width: 46%; width: 46%;
border-radius: 20rpx; border-radius: 20rpx;
padding: 25rpx 25rpx 20rpx 25rpx; padding: 25rpx; padding-bottom: 5rpx;
margin: 0 20rpx 20rpx 20rpx; margin: 0 20rpx 20rpx 20rpx;
background-color: #fff; background-color: #fff;
border: 1px solid #eee; border: 1px solid #eee;
@@ -1140,12 +1145,12 @@
.goodsName { .goodsName {
margin-top: 10rpx; margin-top: 10rpx;
font-size: 30rpx; font-size: 28rpx;
// font-weight: bold; // font-weight: bold;
} }
.goodsPrice { .goodsPrice {
font-size: 30rpx; font-size: 28rpx;
margin: 5rpx 0 0 3rpx; margin: 5rpx 0 0 3rpx;
display: flex; justify-content: space-between; display: flex; justify-content: space-between;
.price{ .price{

7
pages/peanut/mine.vue
View File

@@ -89,7 +89,8 @@
<!-- <view class="nav_list" @click="onGoing()"> <!-- <view class="nav_list" @click="onGoing()">
<text>帮助与反馈11111</text> <text>帮助与反馈11111</text>
</view> --> </view> -->
<view class="nav_list" @click="newOnShare" v-if="isAndorid"> <!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
<view class="nav_list" @click="newOnShare">
<text>分享App</text> <text>分享App</text>
</view> </view>
<view class="nav_list" @click="onPageJump('../peanut/aboutUs')"> <view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
@@ -122,7 +123,7 @@
import $http from '@/config/requestConfig.js'; import $http from '@/config/requestConfig.js';
// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare'; // import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
import { import {
mapState mapState,mapMutations
} from 'vuex'; } from 'vuex';
export default { export default {
data() { data() {
@@ -160,6 +161,7 @@
}, },
//方法 //方法
methods: { methods: {
...mapMutations(['setUserInfo']),
// 获得操作系统 // 获得操作系统
getOS(){ getOS(){
let oprateOs = '' let oprateOs = ''
@@ -278,6 +280,7 @@
// 退出登录 // 退出登录
signOut() { signOut() {
this.signShow = false this.signShow = false
this.setUserInfo({'token': null})
uni.reLaunch({ uni.reLaunch({
url: '../user/login' url: '../user/login'
}); });

290
pages/user/addAddress.vue
View File

@@ -19,8 +19,8 @@
<u-form-item label="所在地区 :" prop=""> <u-form-item label="所在地区 :" prop="">
<view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view> <view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view>
<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName" --> <u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName"
@confirm="addconfirm" @change="changeHandler" ></u-picker> @confirm="addconfirm" @change="changeHandler" ></u-picker>
</u-form-item> </u-form-item>
<u-form-item label="详细地址 :" prop="useraddress"> <u-form-item label="详细地址 :" prop="useraddress">
<u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable <u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable
@@ -50,6 +50,7 @@
</template> </template>
<script> <script>
import musicPlay from '@/components/music.vue' import musicPlay from '@/components/music.vue'
import $http from '@/config/requestConfig.js'; import $http from '@/config/requestConfig.js';
import addressList1 from "@/static/json/address.json" import addressList1 from "@/static/json/address.json"
@@ -63,14 +64,14 @@
// indexp:0, // indexp:0,
// indexq:0, // indexq:0,
// indexc:0, // indexc:0,
playData: {}, playData:{},
addreShow: false, //是否显示 addreShow: false, //是否显示
columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据 columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
columnData: [], //市数据 columnData: [], //市数据
columnDatas: [], //区地址 columnDatas: [], //区地址
switchTrue: true, switchTrue: true,
switchFalse: false, switchFalse: false,
addressChanged: false, // 地址修改标记 addressChanged:false, // 地址修改标记
navName: '', // 顶部导航栏标题 navName: '', // 顶部导航栏标题
provId: '', // 存储省id provId: '', // 存储省id
cityId: '', // 存储市id cityId: '', // 存储市id
@@ -90,51 +91,6 @@
isShowDel: false, isShowDel: false,
editIndex: 0, editIndex: 0,
deleteShow: false, deleteShow: false,
list: [{
value: 1,
label: '中国',
children: [{
value: 2,
label: '广东',
children: [{
value: 3,
label: '深圳'
},
{
value: 4,
label: '广州'
}
]
},
{
value: 5,
label: '广西',
children: [{
value: 6,
label: '南宁'
},
{
value: 7,
label: '桂林'
}
]
}
]
},
{
value: 8,
label: '美国',
children: [{
value: 9,
label: '纽约',
children: [{
value: 10,
label: '皇后街区'
}]
}]
}
],
rules: { rules: {
username: [{ username: [{
required: true, required: true,
@@ -192,7 +148,7 @@
onReady() { onReady() {
this.$refs.addForm.setRules(this.rules) this.$refs.addForm.setRules(this.rules)
}, },
components: { components:{
musicPlay musicPlay
}, },
methods: { methods: {
@@ -200,105 +156,105 @@
initDataPicker() { initDataPicker() {
// console.log(this.addressList,'addressList') // console.log(this.addressList,'addressList')
// this.$http // this.$http
// .post('api/province/getProvince') // .post('api/province/getProvince')
// .then(res => { // .then(res => {
// if (res.code == 0) { // if (res.code == 0) {
// this.addressList = res.provinceEntity // this.addressList = res.provinceEntity
//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组 //此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
let province = []; //初始数据需要展示的省份 let province = []; //初始数据需要展示的省份
let province1 = [{ let province1 = [{
"cityId": this.addressList[0].cityList[0].cityId, "cityId": this.addressList[0].cityList[0].cityId,
"provId": this.addressList[0].cityList[0].provId, "provId": this.addressList[0].cityList[0].provId,
"cityName": this.addressList[0].cityList[0].cityName, "cityName": this.addressList[0].cityList[0].cityName,
"UName": this.addressList[0].cityList[0].cityName, "UName": this.addressList[0].cityList[0].cityName,
"createDate": this.addressList[0].cityList[0].createDate, "createDate": this.addressList[0].cityList[0].createDate,
"regionCode": this.addressList[0].cityList[0].regionCode, "regionCode": this.addressList[0].cityList[0].regionCode,
"countyList": this.addressList[0].cityList[0].countyList "countyList": this.addressList[0].cityList[0].countyList
}]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区 }]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区
let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区 let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区
for (let i = 0; i < this.addressList.length; i++) { for (let i = 0; i < this.addressList.length; i++) {
this.addressList[i].UName = this.addressList[i].provName this.addressList[i].UName = this.addressList[i].provName
if (this.addressList[i].cityList == null) { if (this.addressList[i].cityList == null) {
this.addressList[i].cityList = [{ this.addressList[i].cityList = [{
"cityId": this.addressList[i].provId, "cityId": this.addressList[i].provId,
"provId": this.addressList[i].provId, "provId": this.addressList[i].provId,
"cityName": this.addressList[i].provName, "cityName": this.addressList[i].provName,
"UName": this.addressList[i].provName, "UName": this.addressList[i].provName,
"createDate": this.addressList[i].createDate, "createDate": this.addressList[i].createDate,
"regionCode": this.addressList[i].regionCode, "regionCode": this.addressList[i].regionCode,
"countyList": [{ "countyList": [{
"countyId": this.addressList[i].provId, "countyId": this.addressList[i].provId,
"cityId": this.addressList[i].provId, "cityId": this.addressList[i].provId,
"countyName": this.addressList[i].provName, "countyName": this.addressList[i].provName,
"UName": this.addressList[i].provName, "UName": this.addressList[i].provName,
"createDate": this.addressList[i].createDate, "createDate": this.addressList[i].createDate,
"regionCode": this.addressList[i].regionCode "regionCode": this.addressList[i].regionCode
}] }]
}] }]
} else { } else {
for (let j = 0; j < this.addressList[i].cityList.length; j++) { for (let j = 0; j < this.addressList[i].cityList.length; j++) {
this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j] this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j]
.cityName .cityName
for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) { for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) {
this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i] this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i]
.cityList[j].countyList[k].countyName .cityList[j].countyList[k].countyName
}
}
}
province.push(this.addressList[i]);
} }
}
}
province.push(this.addressList[i]);
}
this.addressList[0].cityList[0].countyList.map(item => { this.addressList[0].cityList[0].countyList.map(item => {
province2.push(item); province2.push(item);
}); });
//省数据 因为要做数据初始化，所以是三维数组 //省数据 因为要做数据初始化，所以是三维数组
// 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ] // 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ]
this.columns.push(province); this.columns.push(province);
this.columns.push(province1); this.columns.push(province1);
this.columns.push(province2); this.columns.push(province2);
// console.log(6666666,this.columns) // console.log(6666666,this.columns)
// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组 // 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据 // 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
this.addressList.map(item => { this.addressList.map(item => {
let city = []; let city = [];
item.cityList.map(item1 => { item.cityList.map(item1 => {
city.push(item1); city.push(item1);
}); });
this.columnData.push(city); this.columnData.push(city);
}); });
//区数据数组 //区数据数组
//数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,] , [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,] ] //数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,] , [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,] ]
let area = []; let area = [];
this.addressList.map((item, index) => { this.addressList.map((item, index) => {
let area1 = []; //省下面所有市的初始化 let area1 = []; //省下面所有市的初始化
item.cityList.map(item1 => { item.cityList.map(item1 => {
area = []; //市下面的区初始化 area = []; //市下面的区初始化
item1.countyList.map(item2 => { item1.countyList.map(item2 => {
area.push(item2); area.push(item2);
}); });
area1.push(area); // 每循环一个市，添加该市下面的所有区 area1.push(area); // 每循环一个市，添加该市下面的所有区
}); });
this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市 this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
}); });
// }; // };
// }).catch(e => { // }).catch(e => {
// console.log(e,'e') // console.log(e,'e')
// }) // })
}, },
changeHandler(e) { //城市选择时触发 changeHandler(e) { //城市选择时触发
console.log(e, '变化了', this.columnData, this.columnDatas) // console.log(e,'变化了',this.columnData, this.columnDatas)
this.addressChanged = true this.addressChanged = true
const { const {
columnIndex, //当前选择的列，省 / 市 / 区 columnIndex, //当前选择的列，省 / 市 / 区
value, // 当前选择的数组内容 value, // 当前选择的数组内容
@@ -322,7 +278,7 @@
}, },
addconfirm(e) { //点击确定按钮 addconfirm(e) { //点击确定按钮
console.log(e, '选中的值') // console.log(e,'选中的值')
this.addressChanged = true this.addressChanged = true
this.addreShow = false; this.addreShow = false;
this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName
@@ -369,15 +325,15 @@
// let data = this.addressForm // let data = this.addressForm
let data = { let data = {
'id': this.addressForm.addressid, 'id':this.addressForm.addressid,
'detailAddress': this.addressForm.useraddress, 'detailAddress' : this.addressForm.useraddress,
'regionCode': this.countyId, 'regionCode':this.countyId,
'userId': this.userInfo.id, 'userId':this.userInfo.id,
'consigneePhone': this.addressForm.userphone, 'consigneePhone':this.addressForm.userphone,
'consigneeName': this.addressForm.username, 'consigneeName': this.addressForm.username,
'isDefault': this.addressForm.isDafault ? 1 : 0 'isDefault':this.addressForm.isDafault ? 1 : 0
} }
console.log(data, '保存参数') console.log(data,'保存参数')
$http.request({ $http.request({
url: link_add, url: link_add,
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -419,17 +375,16 @@
.then(res => { .then(res => {
if (res.code == 0) { if (res.code == 0) {
this.addressForm = { this.addressForm = {
'useraddress': res.list[this.editIndex].detailAddress, 'useraddress':res.list[this.editIndex].detailAddress,
'userphone': res.list[this.editIndex].consigneePhone, 'userphone':res.list[this.editIndex].consigneePhone,
'username': res.list[this.editIndex].consigneeName, 'username':res.list[this.editIndex].consigneeName,
'isdefault': res.list[this.editIndex].isDefault, 'isdefault':res.list[this.editIndex].isDefault,
'isDafault': res.list[this.editIndex].isDefault == 1 ? true : false, 'isDafault':res.list[this.editIndex].isDefault == 1 ? true : false,
'areaidpathtext': res.list[this.editIndex].province + '-' + res.list[this 'areaidpathtext':res.list[this.editIndex].province +'-'+ res.list[this.editIndex].city +'-'+ res.list[this.editIndex].county
.editIndex].city + '-' + res.list[this.editIndex].county, ,'addressid':res.list[this.editIndex].id
'addressid': res.list[this.editIndex].id
} }
this.countyId = res.list[this.editIndex].regionCode this.countyId = res.list[this.editIndex].regionCode
// this.addressForm = res.list[this.editIndex] // this.addressForm = res.list[this.editIndex]
if (this.addressForm.isdefault == 1) { if (this.addressForm.isdefault == 1) {
this.addressForm.isDafault = true this.addressForm.isDafault = true
} }
@@ -444,15 +399,15 @@
this.deleteShow = false this.deleteShow = false
this.$http this.$http
.get(`book/userAddress/delete?id=${this.addressForm.addressid}`) .get(`book/userAddress/delete?id=${this.addressForm.addressid}`)
.then(res => { .then(res => {
if (res.code == 0) { if (res.code == 0) {
uni.showToast({ uni.showToast({
title: '地址删除成功', title: '地址删除成功',
duration: 1000, duration: 1000,
}); });
uni.navigateBack() uni.navigateBack()
} }
}) })
}, },
}, },
@@ -461,19 +416,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.flexbox { .flexbox{display: flex;}
display: flex; .selectAdd{ justify-content: space-between;
.addItem{ display: block;width: 30%}
} }
.selectAdd {
justify-content: space-between;
.addItem {
display: block;
width: 30%
}
}
.add_arrow { .add_arrow {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;

116
pages/user/login.vue
View File

@@ -15,26 +15,31 @@
<!-- <view class="title" :class="{ active: type == 2000 }" @click="type = 2000">验证码登录/注册</view> <!-- <view class="title" :class="{ active: type == 2000 }" @click="type = 2000">验证码登录/注册</view>
<view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> --> <view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> -->
</view> </view>
<view class="input_tit">手机号</view> <view class="flexbox" style=" margin-top: 20rpx;">
<!-- 带区号 --> <view class="input_tit" style="margin-top: 0; margin-right: 20rpx;">手机号</view>
<!-- <view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
<view class="quhao"> <view class="quhao">
<uni-data-select <uni-data-select class="myselect" placeholder="选择区号" v-model="quCode" :localdata="quCodeList" style="height: 30rpx !important;"
placeholder="区号" model="quCode" @change="quChange"></uni-data-select>
:localdata="quCodeList"
@change="quChange"
></uni-data-select>
</view> </view>
<view class="triangle borderBottom phoneNumberInput" :clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']"> </view>
<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" /> <!-- 带区号 -->
<view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
<view class="triangle borderBottom phoneNumberInput" style="width: 150rpx;">
<input type="number" v-model="quCode" placeholder="区号" placeholder-class="grey" />
</view> </view>
</view> --> <view class="triangle borderBottom phoneNumberInput"
:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
placeholder-class="grey" />
</view>
</view>
<!-- 不带区号 --> <!-- 不带区号 -->
<view class="triangle borderBottom phoneNumberInput input_box" <!-- <view class="triangle borderBottom phoneNumberInput input_box"
:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']"> :clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" /> <input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" />
</view> </view> -->
<view class="input_tit" v-if="type == 1000">密码</view> <view class="input_tit" v-if="type == 1000">密码</view>
<view class="input_box" v-if="type == 1000"> <view class="input_box" v-if="type == 1000">
@@ -190,16 +195,8 @@
Content: '' Content: ''
}, },
quShow: false, quShow: false,
quCodeList: [{ quCodeList: [], // 国家区域码
value: '1', quCode: 86,
text: '江'
},
{
value: '2',
text: '湖'
}
],
quCode: null,
}; };
}, },
@@ -216,11 +213,43 @@
// #endif // #endif
}, },
//页面显示 //页面显示
onShow() {}, onShow() {
this.getCountyCode()
},
//方法 //方法
methods: { methods: {
...mapMutations(['setUserInfo']), ...mapMutations(['setUserInfo']),
...mapMutations(['setHealthMes']), ...mapMutations(['setHealthMes']),
// 获取国家区域编码
getCountyCode() {
$http.request({
url: "book/baseArea/getAllBaseArea",
method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
data: {},
header: { //默认 无 说明：请求头
'Content-Type': 'application/json'
},
})
.then(res => {
// console.log(res,'区域码')
if (res.code == 0 && res.baseAreas.length > 0) {
// this.quCodeList = res.baseAreas
this.quCodeList = res.baseAreas.map(item => {
let obj = {
'text': item.title,
'value': item.code,
}
return obj
})
// console.log('改变格式后',this.quCodeList)
} else {
this.quCodeList = []
// this.totalPage = 0
}
}).catch(e => {
console.log(e, 'e')
});
},
quChange(e) { quChange(e) {
console.log(e, 'e') console.log(e, 'e')
}, },
@@ -294,12 +323,15 @@
}); });
return; return;
} }
if (!this.$base.phoneRegular.test(this.phone)) { if (this.quCode == null || this.quCode == 86) { // 如果没选择国家code，默认是中国大陆
uni.showToast({ if (!this.$base.phoneRegular.test(this.phone)) {
title: '手机格式不正确', uni.showToast({
icon: 'none' title: '手机格式不正确',
}); icon: 'none'
return; });
return;
}
console.log(this.quCode, '选择的区段')
} }
if (!this.agree) { if (!this.agree) {
uni.showToast({ uni.showToast({
@@ -312,6 +344,7 @@
this.$http this.$http
.get('book/user/sms/sendcode', { .get('book/user/sms/sendcode', {
phone: this.phone, phone: this.phone,
areaCode: this.quCode,
type: 2000 type: 2000
}) })
.then(res => { .then(res => {
@@ -339,12 +372,14 @@
}); });
return; return;
} }
if (!this.$base.phoneRegular.test(this.phone)) { if (this.quCode == null || this.quCode == 86) {
uni.showToast({ if (!this.$base.phoneRegular.test(this.phone)) {
title: '手机格式不正确', uni.showToast({
icon: 'none' title: '手机格式不正确',
}); icon: 'none'
return; });
return;
}
} }
let httpData = {}; let httpData = {};
if (this.type == 2000) { if (this.type == 2000) {
@@ -635,10 +670,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/style/mixin.scss'; @import '@/style/mixin.scss';
.myselect{height: 50rpx !important;}
.phoneNumberInput { .phoneNumberInput {
width: calc(100% - 130rpx); width: calc(100% - 160rpx);
width: 100%; // width: 100%;
height: 67rpx; height: 67rpx;
input { input {
@@ -656,7 +691,8 @@
} }
.quhao { .quhao {
width: 120rpx; height: 50rpx;
width: 180rpx;
} }
.highlight { .highlight {

BIN
static/icon/five3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/icon/hehanandLogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
static/icon/home1-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
static/icon/home1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
static/icon/home2-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
static/icon/home2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
static/icon/home3-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
static/icon/home3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
static/icon/home4-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/icon/home4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB