Merge pull request 'zmr' (#30) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/30
This commit is contained in:
zhaomingrui 2020-06-23 08:52:40 +08:00
commit a900101039
10 changed files with 508 additions and 138 deletions

View File

@ -68,6 +68,10 @@ export default {
launch_id: launch_id
});
},
// 标签的列表
labelList({}) {
return vm.$u.post('StartUp/labelList', {});
},
// 获取地区列表
getAreaList({ pid }) {
return vm.$u.post('Area/areaList', {
@ -78,6 +82,6 @@ export default {
getAddressList() {
return vm.$u.post('MemberAddress/addressList');
}
}
}
}
}

View File

@ -0,0 +1,74 @@
/*
graceUI rich-text 鍔犲己宸ュ叿
link : graceui.hcoder.net
author : 5213606@qq.com 娣辨捣
*/
// 姝e垯鍙橀噺
var graceRichTextReg;
// 鎵归噺鏇挎崲鐨勬牱寮<E789B1> [ 鏍规嵁椤圭洰闇€姹傝嚜琛岃缃<EE8695> ]
var GRT = [
// div 鏍峰紡
['div', "line-height:2em;"],
// h1 鏍峰紡
['h1', "font-size:3em; line-height:1.5em;"],
// h2 鏍峰紡
['h2', "font-size:2em; line-height:1.8em;"],
// h3 鏍峰紡
['h3', "font-size:1.6em; line-height:2em;"],
// h4 鏍峰紡
['h4', "font-size:1.2em; line-height:2em;"],
// h5 鏍峰紡
['h5', "font-size:1em; line-height:2em;"],
// h6 鏍峰紡
['h6', "font-size:0.9em; line-height:2em;"],
// p 鏍峰紡
['p', "font-size:1em; line-height:2em;"],
// b 鏍峰紡
['b', "font-size:1em; line-height:2em;"],
// strong 鏍峰紡
['strong', "font-size:1em; line-height:2em;"],
// code 鏍峰紡
['code', "font-size:1em; line-height:1.2em; background:#F6F7F8; padding:8px 2%; width:96%;"],
// img 鏍峰紡
['img', "width:100%; margin:8px 0;"],
// blockquote
['blockquote', "font-size:1em; border-left:3px solid #D1D1D1; line-height:2em; border-radius:5px; background:#F6F7F8; padding:8px 2%;"],
// li 鏍峰紡
['ul', "padding:5px 0; list-style:none; padding:0; margin:0;"],
['li', "line-height:1.5em; padding:5px 0; list-style:none; padding:0; margin:0; margin-top:10px;"],
// table
['table', "width:100%; border-left:1px solid #F2F3F4; border-top:1px solid #F2F3F4;"],
['th', "border-right:1px solid #F2F3F4; border-bottom:1px solid #F2F3F4;"],
['td', "border-right:1px solid #F2F3F4; border-bottom:1px solid #F2F3F4; padding-left:5px;"]
];
module.exports = {
format : function(html){
html = html.replace(/<pre.*pre>?/gis, function(word){
word = word.replace(/[\n]/gi,'<br />');
word = word.replace(/ /gi,'<span style="padding-left:2em;"></span>');
return word.replace(/[\t]/gi, '<span style="padding-left:2em;"></span>');
});
html = html.replace(/<pre/gi, '<p style="font-size:1em; margin:12px 0; line-height:1.2em; background:#F6F7F8; border-radius:5px; padding:8px 4%; width:92%;"');
html = html.replace(/<\/pre/gi,"</p");
for(let i = 0; i < GRT.length; i++){
graceRichTextReg = new RegExp('<'+GRT[i][0]+'>|<'+GRT[i][0]+' (.*?)>', 'gi');
html = html.replace(graceRichTextReg , function(word){
// 鍒嗘瀽 dom 涓婃槸鍚﹀甫鏈<E794AB> style=""
if(word.indexOf('style=') != -1){
var regIn = new RegExp('<' + GRT[i][0] + '(.*?)style="(.*?)"(.*?)(/?)>', 'gi');
return word.replace(regIn, '<'+ GRT[i][0] +'$1style="$2 ' + GRT[i][1] +'"$3$4>');
}else{
var regIn = new RegExp('<' + GRT[i][0] + '(.*?)(/?)>', 'gi');
return word.replace(regIn, '<'+ GRT[i][0] +'$1 style="' + GRT[i][1] +'$2">');
}
});
}
return html;
}
}

View File

@ -22,7 +22,7 @@
</view>
<view class="edit-btn">保存地址</view>
<!-- <u-picker mode="region" v-model="show" @confirm="setArea"></u-picker> -->
<u-select v-model="show" mode="mutil-column-auto" :list="areaList" @confirm="setArea"></u-select>
<!-- <u-select v-model="show" mode="mutil-column-auto" :list="areaList" @confirm="setArea"></u-select> -->
</view>
</template>
<script>

View File

@ -1,19 +1,32 @@
<template>
<view>
<image v-if="type" class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image>
<view v-if="type" class="welcome_jumpes" @click="leap_over" >跳过{{remaining}}</view>
<view v-if="banner" class="welcome_jumpes" @click="leap_overto" >跳过</view>
<!-- <image v-if="type" class="welcome_images" src="../../static/pageA/welcome_img.jpg" mode="aspectFill"></image> -->
<view v-if="type" id="video_mp4">
<view class="page-body">
<view class="page-section">
<video id="myVideo" :src=" 'https://' + vide0_url" :controls="controls" :autoplay="autoplayes" :loop="loop" @error="videoErrorCallback" enable-danmu danmu-btn></video>
</view>
</view>
</view>
<view v-if="type" class="welcome_jumpes" @click="leap_over">跳过{{remaining}}</view>
<view v-if="banner" class="welcome_jumpes" @click="leap_overto">跳过</view>
<!-- 轮播图 -->
<view class="uni-padding-wrap" v-if="banner" >
<view class="page-section swiper">
<view class="page-section-spacing">
<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
<swiper-item v-for="(item,index) in imgurl" :key="index">
<view class="swiper-item uni-bg-red">
<image :src="item" mode="aspectFill"></image>
</view>
</swiper-item>
</swiper>
<view class="uni-padding-wrap" v-if="banner">
<view class="uni-padding-wrap">
<view class="page-section swiper">
<view class="page-section-spacing">
<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
<swiper-item>
<view class="swiper-item uni-bg-red">A</view>
</swiper-item>
<swiper-item>
<view class="swiper-item uni-bg-green">B</view>
</swiper-item>
<swiper-item>
<view class="swiper-item uni-bg-blue">C</view>
</swiper-item>
</swiper>
</view>
</view>
</view>
</view>
@ -35,82 +48,144 @@
export default {
data() {
return {
remaining : 3,
type:true,
banner : false,
protocol : false,
heightes:'',
imgurl: ['../../static/pageA/welcome_banner.jpg', '../../static/pageA/welcome_img2.jpg', '../../static/pageA/welcome_img3.jpg'],
remaining: 10,
type: true,
banner: false,
protocol: false,
heightes: '',
imgurl: [],
indicatorDots: true,
autoplay: true,
loop : 'true',
interval: 3000,
duration: 500,
vide0_url : '',
agreement: { //
document_title: "",
document_content: ""
}
},
title: 'video',
src: '',
inputValue: '',
controls : false,
autoplayes : true,
danmuList: [{
text: '第 1s 出现的弹幕',
color: '#ff0000',
time: 1
},
{
text: '第 3s 出现的弹幕',
color: '#ff00ff',
time: 3
}
]
};
},
onLoad() {
},
onReady: function(res) {
this.videoContext = uni.createVideoContext('myVideo')
},
methods: {
unescapeHTML (temp){
unescapeHTML(temp) {
temp = "" + temp;
return temp.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");
},
apiwelcome(){
apiwelcome() {
this.$u.api.documentInfo({
document_code:'agreement'
}).then((res)=>{
document_code: 'agreement'
}).then((res) => {
if (res.errCode == 0) {
let agreement = res.data;
// console.log(agreement.document_content)
agreement.document_content = this.unescapeHTML(agreement.document_content);
// console.log(agreement);
this.agreement = agreement;
}
})
//
this.$u.api.pageList({}).then((res)=>{
console.log('协议',res)
this.$u.api.pageList({}).then((res) => {
console.log('协议', res)
let data_image = res.data.welcome_page
let vide0_url = res.data.start_page[0].launch_path
this.list = data_image;
this.vide0_url = vide0_url;
console.log(this.list)
})
},
// 3
remaining_time(){
this.timer=setInterval(() => {
remaining_time() {
this.timer = setInterval(() => {
this.remaining--;
if(this.remaining <= 0){
if (this.remaining <= 0) {
clearInterval(this.timer);
// console.log("")
console.log("完了")
this.type = !this.type
this.banner = !this.banner;
}
},1000);
}, 1000);
},
leap_over(){
leap_over() {
this.type = !this.type
this.banner = !this.banner;
},
leap_overto(){
leap_overto() {
this.protocol = true
},
getSystemInfo(){
getSystemInfo() {
//
uni.getSystemInfo({
success: function (res) {
this.heightes = res.windowHeight;
console.log( this.heightes)
}
success: function(res) {
this.heightes = res.windowHeight;
console.log(this.heightes)
}
});
},
//
to_agree(){
to_agree() {
uni.navigateTo({
url: '/pageA/login/login'
url: '/pageA/login/login'
});
},
//
bindInputBlur: function(e) {
this.inputValue = e.target.value
},
bindButtonTap: function() {
var that = this
uni.chooseVideo({
sourceType: ['album', 'camera'],
maxDuration: 60,
camera: ['front', 'back'],
success: function(res) {
this.src = res.tempFilePath
}
})
},
bindSendDanmu: function() {
this.videoContext.sendDanmu({
text: this.inputValue,
color: this.getRandomColor()
})
},
videoErrorCallback: function(e) {
console.log('视频错误信息:')
console.log(e.target.errMsg)
},
getRandomColor: function() {
const rgb = []
for (let i = 0; i < 3; ++i) {
let color = Math.floor(Math.random() * 256).toString(16)
color = color.length == 1 ? '0' + color : color
rgb.push(color)
}
return '#' + rgb.join('')
}
},
mounted(){
mounted() {
// 3
this.remaining_time()
//
@ -121,71 +196,96 @@
</script>
<style lang="scss" scoped>
.welcome_jumpes{
.welcome_jumpes {
width: 90rpx;
height: 35rpx;
opacity:0.5;
border-radius:18rpx;
opacity: 0.5;
border-radius: 18rpx;
position: absolute;
right: 37rpx;
top: 34rpx;
font-size:20rpx;
font-size: 20rpx;
text-align: center;
line-height: 35rpx;
color: #fff;
background: #C4CAC6;
z-index: 10;
}
#myVideo{
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
}
uni-video{
width: 100%;
height: auto;
}
.uni-video-container{
background-color: none!important;
}
.welcome_images {
width: 100%;
position: fixed;
height: 100%
}
uni-swiper,uni-view,uni-image{
uni-swiper,
uni-view,
uni-image {
width: 100%;
// position: fixed;
height: 100%
}
uni-image{
uni-image {
width: 100%;
}
//
uni-swiper .uni-swiper-dot-active{
background-color: #fff!important;
uni-swiper .uni-swiper-dot-active {
background-color: #fff !important;
}
.welcome_backes{
.welcome_backes {
width: 100%;
position: fixed;
height: 100%;
background:#999999;
.content{
width:558rpx;
height:730rpx;
background:rgba(255,255,255,1);
background: #999999;
.content {
width: 558rpx;
height: 730rpx;
background: rgba(255, 255, 255, 1);
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
.title{
width:558rpx;
.title {
width: 558rpx;
text-align: center;
height:29rpx;
font-size:30rpx;
font-weight:bold;
color:rgba(51,51,51,1);
line-height:29rpx;
height: 29rpx;
font-size: 30rpx;
font-weight: bold;
color: rgba(51, 51, 51, 1);
line-height: 29rpx;
margin: 30rpx 0 24rpx 0;
}
.scroll {
height: 560rpx;
.protocol_content{
width:494rpx;
height:528rpx;
font-size:24rpx;
font-weight:400;
color:rgba(51,51,51,1);
.protocol_content {
width: 494rpx;
height: 528rpx;
font-size: 24rpx;
font-weight: 400;
color: rgba(51, 51, 51, 1);
display: block;
text-align: left;
margin: 80rpx auto 33rpx;
@ -195,15 +295,16 @@
}
}
.to_agree{
width:558rpx;
font-size:30rpx;
font-weight:bold;
color:rgba(255,121,16,1);
.to_agree {
width: 558rpx;
font-size: 30rpx;
font-weight: bold;
color: rgba(255, 121, 16, 1);
text-align: center;
padding-top: 27rpx;
border-top: #D8D8D8 solid 1px;
}
}
}
</style>
</style>

View File

@ -14,16 +14,16 @@
<!-- <text></text> -->
<input type="tel" placeholder="请输入验证码" v-model="sms_code" />
<!-- <text class="identifying" @click="getCode">{{text}}</text> -->
<identifying @tochange="tochange" :smslog_type="smslog_type" :member_mobile="member_mobile" ></identifying>
<identifying @tochange="tochange" :smslog_type="smslog_type" :member_mobile="member_mobile"></identifying>
</view>
<!-- 服务协议 -->
<view class="pact">
<view></view>
<text>我已详细阅读并同意</text>
<text class="pact_text">用户协议 </text>
<text class="pact_text">隐私协议</text>
<text class="pact_text">使用协议</text>
<view>
<view></view>
<text>我已详细阅读并同意</text>
<text class="pact_text" v-for="(item,index) in pact_text" :key="index" @click="pact_click(index)"> {{item.text}} </text>
</view>
<u-checkbox-group @change="checkboxGroupChange" size="27">
<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
shape="circle" size="14" active-color="#19BE6B"></u-checkbox>
@ -68,50 +68,100 @@
disabled: false
}],
value: '',
phones : '',
phones: '',
text: '获取验证码',
login: '登录',
register : '新用户点击注册',
register: '新用户点击注册',
show: false,
tips: '',
// refCode: null,
seconds: 60,
member_mobile: '', //
smslog_type : '2',//
sms_code : '', //
smslog_type: '2', //
sms_code: '', //
//
pact_text: [{
"id": '1',
"text": "《用户协议》"
}, {
"id": '2',
"text": "《隐私协议》"
}, {
"id": '3',
"text": "《使用协议》"
},
]
};
},
onLoad() {
//
this.apiwelcome()
this.apiwelcome()
},
methods: {
apiwelcome(){
apiwelcome() {
this.$u.api.sendSmsCode({
}).then((res)=>{
}).then((res) => {
console.log(res)
})
},
//
pact_click(index){
console.log(index)
uni.navigateTo({
url: '/pageA/pactList/pactList?index=' + index
});
},
//
loginOn(){
// console.log("")
loginOn() {
console.log("登录")
// console.log(this.member_mobile)
// console.log(this.sms_code)
//
//
let type_phone = this.$u.test.mobile( this.member_mobile)
if( this.member_mobile == ''){
this.$refs.uToast.show({
title: '手机号不能为空',
type: 'error'
})
return false;
}
if (type_phone == false) {
this.$refs.uToast.show({
title: '手机号格式不正确',
type: 'error'
});
return false;
}
if( this.sms_code == ''){
this.$refs.uToast.show({
title: '验证码不能为空',
type: 'error'
})
return false;
}
this.$u.api.phoneLogin({
member_mobile: this.member_mobile,
sms_code: this.sms_code
}).then((res) => {
console.log(res)
// console.log(res)
if(res.errCode == 0){
if (res.errCode == 0) {
//
uni.setStorage({
key: 'user_info',
data: res.data,
success: function () {
console.log('success');
}
key: 'user_info',
data: res.data,
success: function() {
console.log('success');
//
uni.navigateTo({
url : '/pageA/topick/topick'
})
}
});
// token
uni.setStorage({
key: 'token',
@ -124,61 +174,61 @@
url: '/pageA/topick/topick'
})
}
if(res.errCode == 1){
if (res.errCode == 1) {
this.$refs.uToast.show({
title: res.message,
type: 'error'
})
}
})
},
// qq
rect_qq(){
rect_qq() {
console.log("授权Q")
var vm = this;
uni.getProvider({
service: 'oauth',
success: function (res) {
console.log('qq',res) //weixin
success: function(res) {
console.log('qq', res) //weixin
if (~res.provider.indexOf('qq')) {
uni.login({
provider: 'qq',
success: function (loginRes) {
provider: 'qq',
success: function(loginRes) {
console.log(loginRes)
this.getApplogin(loginRes)
vm.$HTTP({
method: 'GET',
baseURL:'https://graph.qq.com/user/get_user_info',
url: '',
data: {
openid:loginRes.authResult.openid,
access_token:loginRes.authResult.access_token,
appid:'101884160'
},
load:true
}).then((data) =>{
console.log(data)
method: 'GET',
baseURL: 'https://graph.qq.com/user/get_user_info',
url: '',
data: {
openid: loginRes.authResult.openid,
access_token: loginRes.authResult.access_token,
appid: '101884160'
},
load: true
}).then((data) => {
console.log(data)
}, (err) => {
console.log(err)
console.log(err)
});
}
});
}else{
} else {
console.log("错误")
}
}
});
},
//
registerUrl(){
registerUrl() {
uni.navigateTo({
url: '/pageA/register/register'
});
},
//
getApplogin(){
getApplogin() {
console.log("11")
},
// checkbox
@ -192,18 +242,17 @@
mask_u() {
this.show = !this.show
},
tochange(){
tochange() {
}
},
components:{
components: {
identifying
}
};
</script>
<style lang="scss" scoped>
.login {
// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
@ -282,9 +331,7 @@
margin-bottom: 10px;
}
.identifying {
}
.identifying {}
}
.uni-input-input,
@ -297,23 +344,29 @@
font-size: 22rpx;
font-weight: 400;
color: rgba(255, 255, 255, 1);
line-height: 36px;
// line-height: 36px;
}
.pact>view:first-child {
float: left;
}
.pact_text {
font-size: 22px;
font-weight: 400;
color: rgba(129, 188, 253, 1) !important;
line-height: 36px;
// line-height: 36px;
}
//
.pact {
position: relative;
padding-left: 40rpx;
overflow: hidden; //
text-overflow: ellipsis; //
white-space: nowrap; //
overflow: hidden;
// overflow: hidden; //
// text-overflow: ellipsis; //
// white-space: nowrap; //
}
.u-checkbox-group {

View File

@ -0,0 +1,74 @@
<template>
<view class="packlist">
<view>
<rich-text class="rict_type" :nodes="document_content"></rich-text>
</view>
</view>
</template>
<script>
var graceRichText = require("../../components/logininput/rictText.js");
export default {
data() {
return {
document_content : ''
}
},
onLoad(option) {
console.log(option)
//
let typeIindex = option.index;
this.typeIndexRquest(typeIindex)
},
methods: {
unescapeHTML (temp){
temp = "" + temp;
return temp.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");
},
typeIndexRquest(typeIindex){
// 3 0 1 2 agreementopen_storeprivacyuse使
if(typeIindex == 0){
this.$u.api.documentInfo({
document_code: 'agreement'
}).then((res)=>{
console.log(res)
let data = this.unescapeHTML(res.data.document_content);
this.document_content = data
})
}
if(typeIindex == 1){
this.$u.api.documentInfo({
document_code: 'privacy'
}).then((res)=>{
console.log(res)
let data = this.unescapeHTML(res.data.document_content);
this.document_content = data
})
}
if(typeIindex == 2){
this.$u.api.documentInfo({
document_code: 'use'
}).then((res)=>{
console.log(res)
let data = this.unescapeHTML(res.data.document_content);
this.document_content = data
})
}
}
},
mounted(){
},
components:{}
}
</script>
<style lang="scss" scoped>
.packlist{}
.packlist > view{
width:676px;
font-size:26rpx;
color: #333;
width: 90%;
margin: 0 auto;
}
</style>

View File

@ -80,11 +80,35 @@
methods: {
//
loginIn(){
let type_phone = this.$u.test.mobile( this.member_mobile)
if( this.member_mobile == ''){
this.$refs.uToast.show({
title: '手机号不能为空',
type: 'error'
})
return false;
}
if (type_phone == false) {
this.$refs.uToast.show({
title: '手机号格式不正确',
type: 'error'
});
return false;
}
if( this.sms_code == ''){
this.$refs.uToast.show({
title: '验证码不能为空',
type: 'error'
})
return false;
}
this.$u.api.phoneRegister({
member_mobile: this.member_mobile,
sms_code: this.sms_code
}).then((res) => {
console.log(res)
console.log('3333333333',res);
//
// console.log(res)
if(res.errCode == 0){
//
@ -93,6 +117,10 @@
data: res.data,
success: function () {
console.log('success');
//
uni.navigateTo({
url : '/pageA/topick/topick'
})
}
});
//
@ -108,6 +136,13 @@
type: 'error'
})
}
if(res.errCode == 2){
this.$refs.uToast.show({
title: res.message,
type: 'primary',
url: '/pageA/login/login'
})
}
})
},
// checkbox

View File

@ -10,7 +10,7 @@
</view>
<!-- 标签 -->
<view class="tab_lable">
<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index)">{{item}}</view>
<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index)">{{item.name}}</view>
</view>
<!-- 提交按钮 -->
<view class="submites" @click="toHomePage">{{submites}}</view>
@ -28,11 +28,19 @@
value: '',
login: '登录',
show: false,
tab_lables: ["科技", "科技", "科技", "科技", "科技", "科技", "科技", "科技", "科技", "科技"],
tab_lables: [],
submites: '选好了进入首页',
rSelect:[]
};
},
onLoad(){
//
this.labelList()
},
mounted(){
},
methods: {
// checkbox
checkboxChange(e) {
@ -59,7 +67,17 @@
uni.switchTab({
url: '/pages/index/index'
});
}
},
//
labelList(){
console.log("11111222")
this.$u.api.labelList({
}).then((res) => {
console.log(res)
this.tab_lables = res.data
})
},
}
};
</script>

View File

@ -17,6 +17,17 @@
}
}
},
{
"path": "pactList/pactList",
"style": {
"navigationBarTitleText": "用户协议详情",
"app-plus":{
"titleNView":{
"backgroundColor":"#fff"
}
}
}
},
{
"path": "bindinges/bindinges",
"style": {

BIN
static/mp4.mp4 Normal file

Binary file not shown.