Skip to content

K
kxz-app-phone
Commit 6de8d270 by huahua
Options

提交

parent 2d45064b
Showing with 290 additions and 197 deletions
pages/index/Signin.vue
......@@ -17,23 +17,24 @@
<button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar">
<image :src="avatarUrl" class="refreshIcon"></image>
</button>
<view style="margin: auto; width: 100%; text-align: center;color: #999; margin-top: 0upx; " >点击获取微信头像</view>
<view style="margin: auto; width: 100%; text-align: center;color: #999; margin-top: 0upx;">点击获取微信头像</view>
</view>
<!-- <view style="width: calc(100% - 100upx); height: 1upx; background: #eee; margin: auto; margin-top: 40upx;"> </view> -->
<view class="nickname" style="background: #61D119; margin-top: 40upx;">
<!--<text>昵称：</text> -->
<!-- <view class="nickname" style="background: #61D119; margin-top: 40upx;">
<input type="nickname" class="weui-input" style="color: #fff;" :value="nickName" @blur="bindblur" placeholder="点击获取微信昵称"
@input="bindinput" placeholder-class="my-input-placeholder"/>
</view>
</view> -->
<!-- <view style="width: calc(100% - 100upx); height: 1upx; background: #eee; margin: auto;"> </view>-->
<view class="btn">
<view class="btn-sub" @tap="getUserProfile">保存</view>
<view class="btn-sub" @tap="getUserProfile">确定</view>
</view>
<!--小程序登录、用户信息相关接口调整 -->
<!-- <button class="buttonGetUserInfo cssbut" hover-class="hover-class-bg" v-if="canIUseGetUserProfile" @tap="getUserProfile"> 获取头像昵称 </button>
<button v-else open-type="getUserInfo" @getuserinfo="getUserInfo" lang="zh_CN" class="buttonGetUserInfo cssbut" hover-class="hover-class-bg"> 获取头像昵称 </button> -->
</view>
</view>
</uni-popup>
......@@ -107,7 +108,6 @@
},
bindinput(e) {
//console.log('nickName', e)
this.nickName = e.detail.value;
},
......@@ -131,18 +131,6 @@
},
getUserProfile(e) {
if (this.nickName === '') {
uni.showToast({
icon: 'none',
title: '请输入昵称'
})
return false;
}
uni.getSetting({
success(res) {
}
})
let that = this;
wx.getUserProfile({
lang: 'zh_CN',
......@@ -156,7 +144,6 @@
uni.login({
provider: 'weixin',
success: (weixinres) => {
console.log(weixinres)
if (weixinres.code) {
that.loginInfo = Userres.userInfo;
that.loginInfo.encryptedData = Userres.encryptedData;
......@@ -177,9 +164,8 @@
machine_id: that.$base
.machine_id, //用户进入设备id
}).then(result => {
uni.setStorageSync('token', result.token)
uni.setStorageSync('uid', result.id)
uni.setStorageSync('uid', result.id)
uni.hideLoading();
uni.showToast({
title: '登录成功',
......@@ -189,7 +175,7 @@
}).catch(err => {
uni.hideLoading();
uni.showToast({
title: err.msg,
title: '登录失败！',
icon: 'none'
});
})
......@@ -337,9 +323,10 @@
</script>
<style lang="scss">
@import "./css/main.css";
/* 去除button默认样式 */
/*去除button默认样式 */
.cssbut {
background-color: transparent !important;
padding-left: 0 !important;
......
pages/index/components/head.vue 0 → 100644
<template>
<view :style="{ height: height + 'px', background:background}" style="position: fixed; z-index: 999;">
<view class="head" :style="{ height: height + 'px', background:background}">
<view class="back" @click="back" v-if="backShow" :style="{ top: top + 'px', color:color }">
<image v-if="worksid > 0" src="../../../static/recommend/house.png" mode="aspectFit"
style="width: 39upx; height: 39upx; margin-top: calc((32px - 39upx)/2);margin-left: auto; margin-right: auto;"></image>
<image v-else src="../../../static/recommend/icon_back.png" mode="aspectFit" style="width: 42upx; height: 42upx;
margin-top: 20upx;
margin-left: auto; margin-right: auto;"></image>
</view>
<view class="title" v-if="titleShow" :style="{ top: (top ) + 'px', color:color, 'font-size': size + 'rpx' }">{{title}}</view>
</view>
</view>
</template>
<script>
export default {
props: {
worksid:{
type: Number,
default: null
},
title: {
type: String,
default: '自定义标题'
},
size:{
type: String,
default: '32'
},
color:{
type: String,
default: '#000'
},
titleShow: {
type: Boolean,
default: true
},
backShow: {
type: Boolean,
default: true
},
background:{
type: String,
default: "linear-gradient(to right, #43e97b 0%, #38f9d7 100%)"
}
},
data() {
return {
height :0,
top:0,
}
},
mounted() {
},
created() {
//console.log('设备信息')
//设备信息
let app = uni.getSystemInfoSync();
//胶囊信息
let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
this.height = app.statusBarHeight + menuButtonInfo.height + (menuButtonInfo.top - app.statusBarHeight)*2
this.top = menuButtonInfo.top;
},
methods: {
back(){
this.$emit('headBack')
}
},
onLoad(options) {
},
onShow() {
}
}
</script>
<style>
.head{
position: fixed;
width: 750rpx;
z-index: 888;
align-items: center;
}
.title{
position: fixed;
width: 750rpx;
text-align: center;
line-height: 32px;
height: 32px;
}
.back{
position: fixed;
width: 81rpx;
text-align: center;
line-height: 32px;
height: 32px;
font-size: 32rpx;
font-weight: 900;
z-index: 9;
align-items: center;
}
</style>
pages/index/components/scrollView.vue
<template>
<!-- <myhead :color="'#61D119'" :titleShow="true" :backShow="true" :background="'#131319'" style=" "
:headBack="headBack()"></myhead> -->
<!-- 贴图 -->
<view v-if="showState" class="content" style="width: 100%; height: 100%; position: relative;overflow: hidden; "
<view v-if="showState" class="content" style="width: 100%; height: 100%; position: relative;overflow: hidden; background: #00ffff;"
:style="{height: windowHeight +'px',background: backColorVal}">
<refresh ref="refresh" @interrupt="interrupt" @pushToInterrupt="pushToInterrupt" @finished="finished"
@scrolltolower="g" :scrollHeight="windowHeight" :scrollTop="scrollViewTop" @scroll="scroll">
<template slot="top">
<view style="color: #FFFFFF;position: absolute; top: 0;width: 100%; text-align: center;"
:style="'height:' + 40 + 'px; line-height:' + 40 + 'px;'">{{tip}}</view>
:style="'height:' + 40 + 'px; line-height:' + 40 + 'px;'">scsacsa</view>
</template>
<template slot="content">
<view style="width:100%; margin: auto; height:calc(100% - 40upx); overflow: hidden;">
......@@ -29,7 +33,7 @@
v-if="datalist.length == 0">
<span class="iconfont icon-wushuju"
style="font-size: 100upx; text-align: center; color: #B2B2B2;"></span>
<view style="color: #B2B2B2; text-align: center; line-height: 50upx;font-size: 24upx;">啊嘞，还是一片荒漠
<view style="color: #B2B2B2; text-align: center; line-height: 50upx;font-size: 24upx;">啊嘞，还是一片荒漠
</view>
</view>
</view>
......@@ -44,6 +48,7 @@
</template>
<script>
import myhead from './head.vue'; // 页眉
import homeservice from '@/service/homeservice.js';
import refresh from '@/components/xing-refresh/xing-refresh.vue';
export default {
......@@ -54,7 +59,8 @@
}
},
components: {
refresh
refresh,
myhead
},
data() {
return {
......@@ -69,7 +75,7 @@
machine_id: null, //设备id=
material_category_id: "", //
material_series_id: "",
goods_feature_id:null,
goods_feature_id: null,
},
queryCollectionPage: {
......@@ -93,7 +99,7 @@
oldScrollViewTop: 0, //旧数据到顶部位置
e: 0, // 弹窗类型
isWork: false, //是否作品
backColorVal:""
backColorVal: ""
};
},
mounted() {
......@@ -104,6 +110,11 @@
*/
methods: {
headBack() {
this.$emit('Worksdetail', null)
},
scroll(e) {
if (e.detail.scrollTop > 1) {
this.oldScrollViewTop = e.detail.scrollTop - 0.01
......@@ -167,9 +178,9 @@
},
open(item) {
if(item.val){
if (item.val) {
this.backColorVal = item.val
}else{
} else {
this.backColorVal = "";
}
if (this.e != item.e) {
......@@ -215,8 +226,8 @@
is_hot: item.queryPage.is_hot, //热门
goods_id: item.queryPage.goods_id, //商品id
is_under: item.queryPage.is_under, //贴图是否为背景图
partner_id: item.queryPage.partner_id ,//代理
goods_feature_id:this.$base.goods_feature_id
partner_id: item.queryPage.partner_id, //代理
goods_feature_id: this.$base.goods_feature_id
}
if (item.e == 2) { //贴图
if (loadData) {
......@@ -289,7 +300,8 @@
icon: 'none'
});
} else {
this.Material_categorydatalist = this.Material_categorydatalist.concat(result.data.data);
this.Material_categorydatalist = this.Material_categorydatalist.concat(result.data
.data);
this.datalist = this.datalist.concat(result.data.data);
this.queryCollectionPage.page += 1;
if (Math.ceil(result.total / result.per_page) <= this.queryCollectionPage.page) {
......@@ -383,4 +395,4 @@
}
</script>
<style lang="scss">
</style>
</style>
\ No newline at end of file
pages/index/head/head.vue
<template>
<view :style="{ height: height + 'px', background:background}" style="position: fixed; z-index: 999;">
<view class="head" :style="{ height: height + 'px', background:background}">
<view class="back" @click="back" v-if="backShow" :style="{ top: top + 'px', color:color }">
<view class="back" @click="back" v-if="backShow" :style="{ top: top + 'px', color:color }">
<image v-if="worksid > 0" src="../../../static/recommend/house.png" mode="aspectFit"
style="width: 39upx; height: 39upx; margin-top: calc((32px - 39upx)/2);margin-left: auto; margin-right: auto;"></image>
<image v-else src="../../../static/recommend/icon_back.png" mode="aspectFit" style="width: 42upx; height: 42upx;
margin-top: 20upx;
margin-left: auto; margin-right: auto;"></image>
</view>
<view class="title" v-if="titleShow" :style="{ top: top + 'px', color:color, 'font-size': size + 'rpx' }">{{title}}</view>
<view class="title" v-if="titleShow" :style="{ top: (top + 4) + 'px', color:color, 'font-size': size + 'rpx' }">{{title}}</view>
</view>
</view>
</template>
......@@ -66,7 +67,9 @@
methods: {
back(){
if(this.worksid > 0){
// uni.redirectTo({ url: '../index/mall' })
if(this.worksid == 3111 ){
return;
}
uni.reLaunch({
url: '../index/mall'
});
......
pages/index/js/drag.js
......@@ -259,7 +259,8 @@ const drag = {
//四边伸缩
edgeMove(e, item, data, allLineListData, designWidth, designHeight) {
//console.log("四边伸缩")
//修改属性状态
item.active = true //辅助线
item.activeguide = false //辅助线
......@@ -290,7 +291,7 @@ const drag = {
y: 'top'
}
item.elmW += diffX * (-1) //计算宽度
} else if (item.typetext == "top") { //下
} else if (item.typetext == "top") { //上
fixed = {
x: 'left',
y: 'bottom'
......@@ -328,9 +329,9 @@ const drag = {
let newScale = 1;
if (item.typetext == "right") {
let right = designWidth - (item.left + item.width);
/* let right = designWidth - (item.left + item.width);
item.left = item.elmX; //重新赋值左上角x位置
item.width = item.elmW //重新设置宽度
item.width = item.elmW //重新设置宽度 */
newScale = item.elmW / item.lastElmW //计算新比例
if (newScale > 1) { //开始放大处理
let newWidthScale = Math.abs((item.elmW - item.lastElmW) / item.initialWidth);
......
pages/index/nick-name.vue
......@@ -7,22 +7,17 @@
<view style="margin: auto; width: 100%; text-align: center;color: #999; margin-top: 0upx; ">点击获取微信头像</view>
</view>
<view class="nickname" style="background: #61D119; margin-top: 40upx;">
<!--<text>昵称：</text> -->
<!-- <view class="nickname" style="background: #61D119; margin-top: 40upx;">
<input type="nickname" class="weui-input" style="color: #fff;" :value="nickName" @blur="bindblur"
placeholder="点击获取微信昵称" @input="bindinput" placeholder-class="my-input-placeholder" />
</view>
<!-- <view style="width: calc(100% - 100upx); height: 1upx; background: #eee; margin: auto;"> </view>-->
</view> -->
<view class="btn">
<view class="btn-sub" @tap="getUserProfile">保存</view>
</view>
<view class="btn">
<view class="btn-sub" @click="onSubmit">保存</view>
</view>
</view>
</template>
......
pages/index/start-up.vue
......@@ -18,7 +18,7 @@
</view>
<!-- 自定义头部 -->
<myhead :worksid="worksid" :title="myheadtext" :color="'#64DD17'" :titleShow="true" :backShow="true"
<myhead :worksid="worksid" :title="myheadtext" :color="'#64DD17'" :titleShow="true" :backShow="false"
:background="'none'"></myhead>
<view style="position: relative;width: 100%; height: 100%; z-index: 2;">
<!-- 轮播图 status-->
......@@ -67,20 +67,28 @@
</view>
<view v-if="statusloading == 2"
style="margin-top: -50upx;text-align: center;color: #888888; font-weight: 400; line-height: 40upx;">
<text style="font-size: 22upx;">深圳市瑞丰彩科技有限公司</text>
<text style="font-size: 22upx;">广州壳小站有限公司</text>
</view>
</view>
<view v-if="isShowPop"
style="z-index: 999999; width: 100%; height: 100%; position: absolute; top: 0upx; left: 0upx" :style="{height: data.windowHeight +'px'}">
<view class="uni-share full-width" :style="{height: data.windowHeight +'px'}" style="background: #fff;">
<view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 120upx;
z-index: 7;
overflow: hidden;">
<view style="width: 120upx; height: 190upx;"></view>
<view style="width: 120upx; height: 190upx;">
<view :style="{ height: headheight + 'px'}" style="width: 100%; z-index: 9999;">
<view class="back" @tap="cancel('share')">
<image src="../../static/recommend/icon_back.png" mode="aspectFit" style="width: 42upx; height: 42upx;
margin-left: 20upx;" :style="{ marginTop: menuButtonInfoTop + 10 + 'px'}"></image>
</view>
</view>
</view>
<view style="width: 112upx; padding-left: 8upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
:style="{height: (data.windowHeight - 160 * data.pixelRate) +'px'}" scroll-y
......@@ -98,8 +106,7 @@
</view>
<view style="position: absolute; bottom: 0upx; left: 116upx; height: 100%; width: 100%;
z-index: 8; overflow: hidden; ">
z-index: 8; overflow: hidden; ">
<view style="width: calc(100% - 150upx); height: calc(100% - 180upx); position: relative;overflow: hidden;
border: 4upx solid #61D119; margin-top: 140upx; margin-right: 10upx; ">
......@@ -133,15 +140,9 @@
</view>
</view>
</scroll-view>
</view>
</view>
<view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 5upx;
z-index: 9;
overflow: hidden;">
<view style="position: absolute; bottom: 0upx; left: 0;height: 100%; width: 5upx; z-index: 9; overflow: hidden;">
<view style="width: 5upx; padding-left: 0upx; margin-top: 190upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
......@@ -151,15 +152,12 @@
:class="[index == currentId ? 'scroll-item-buttom-select' : 'scroll-item-buttom-no-select']"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)" >
<!-- <view style="width: 20upx; background: #fff;margin-left: 0upx ;height: 140upx" :style="{background: index == currentId ? '#fff' :'#00000000' }"> </view> -->
</view>
</scroll-view>
</view>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
</view>
</view>
<!-- 登录弹框 -->
......@@ -213,7 +211,7 @@
},
stockstatus: null,
msg: null,
worksid: 1,
worksid: 3111,
statusloading: null, //加载状态
phone: '18938664545',
isLoad: false, //是否加载
......@@ -230,7 +228,9 @@
classificationHeight: 0,
goods_id_e:{},
datalist:[],
isShowPop:false
isShowPop:false,
menuButtonInfoTop:0,
headheight:0
};
},
......@@ -725,6 +725,7 @@
}
return null;
}
},
//上拉刷新
......@@ -770,6 +771,10 @@
this.$base.promoter_id = this.getQueryString(qrUrl, 'promoter_id')
}
this.Adlist()
let app = uni.getSystemInfoSync();
let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
this.menuButtonInfoTop = menuButtonInfo.top;
this.headheight = app.statusBarHeight + menuButtonInfo.height + (menuButtonInfo.top - app.statusBarHeight) * 2
this.isLoad = true;
if (this.machine_id != null && this.machine_id != "") {
this.getDetail();
......
util/Env.js
......@@ -5,8 +5,8 @@ if(!accountInfo.miniProgram.envVersion){
const baseApi = {
//开发版
//develop: "https://kxz.refinecolor.com",
develop: "https://print.kexiaozhan.cn",
develop: "https://kxz.refinecolor.com",
//develop: "https://print.kexiaozhan.cn",
//体验版
trial: "https://kxz.refinecolor.com",
//正式版
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment