Skip to content

K
kxz-app-phone
Commit 2d45064b by huahua
Options

提交

parent ab898630
Showing with 98 additions and 80 deletions
pages/index/Signin.vue
...@@ -17,14 +17,16 @@ ...@@ -17,14 +17,16 @@
<button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar"> <button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar">
<image :src="avatarUrl" class="refreshIcon"></image> <image :src="avatarUrl" class="refreshIcon"></image>
</button> </button>
<view style="margin: auto; width: 100%; text-align: center;color: #999; margin-top: 0upx; " >点击获取微信头像</view>
</view> </view>
<view class="nickname" style="background: #fff;"> <!-- <view style="width: calc(100% - 100upx); height: 1upx; background: #eee; margin: auto; margin-top: 40upx;"> </view> -->
<text>昵称：</text> <view class="nickname" style="background: #61D119; margin-top: 40upx;">
<input type="nickname" class="weui-input" :value="nickName" @blur="bindblur" placeholder="请输入昵称" <!--<text>昵称：</text> -->
@input="bindinput"/> <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">
<view class="btn-sub" @tap="getUserProfile">保存</view> <view class="btn-sub" @tap="getUserProfile">保存</view>
</view> </view>
...@@ -105,7 +107,7 @@ ...@@ -105,7 +107,7 @@
}, },
bindinput(e) { bindinput(e) {
console.log('nickName', e) //console.log('nickName', e)
this.nickName = e.detail.value; this.nickName = e.detail.value;
}, },
...@@ -138,8 +140,7 @@ ...@@ -138,8 +140,7 @@
} }
uni.getSetting({ uni.getSetting({
success(res) { success(res) {
//console.log('获取用户信息是否用户同意')
//console.log(res.authSetting)
} }
}) })
let that = this; let that = this;
...@@ -373,7 +374,7 @@ ...@@ -373,7 +374,7 @@
} }
.avatarUrl { .avatarUrl {
padding: 70upx 0 40upx; padding: 40upx 0 40upx;
background: #fff; background: #fff;
button { button {
...@@ -381,7 +382,7 @@ ...@@ -381,7 +382,7 @@
line-height: 80upx; line-height: 80upx;
height: auto; height: auto;
width: auto; width: auto;
padding: 20upx 30upx; padding: 20upx 10upx;
margin: 0; margin: 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -406,29 +407,44 @@ ...@@ -406,29 +407,44 @@
} }
.nickname { .nickname {
background: #EEE; background: #61D119;
padding: 20upx 30upx 80upx; padding: 20upx 30upx 20upx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border: 1upx solid #61D119;
width: 290upx;
height: 40upx;
margin: auto;
font-size: 32upx;
color: #fff;
border-radius: 60upx;
.weui-input { .weui-input {
padding-left: 60upx; text-align: center;
//padding-left: 40upx;
}
} }
.my-input-placeholder {
color: #fff;
} }
.btn { .btn {
width: 100%; width: 100%;
margin-top: 80upx;
.btn-sub { .btn-sub {
width: 670upx; //width: 670upx;
margin: 80upx auto 0; width: 200upx;
height: 90upx; //height: 40upx;
background: #DF8585; /* margin: 80upx auto 0; */
height: 85upx;
margin: auto;
background: #61D119;
border-radius: 45upx; border-radius: 45upx;
line-height: 90upx; line-height: 85upx;
text-align: center; text-align: center;
font-size: 36upx; font-size: 32upx;
color: #fff; color: #fff;
} }
} }
......
pages/index/components/scrollView.vue
<template> <template>
<!-- 贴图 --> <!-- 贴图 -->
<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; "
:style="{height: windowHeight +'px',background: backColorVal}"> :style="{height: windowHeight +'px',background: backColorVal}">
<refresh ref="refresh" @interrupt="interrupt" @pushToInterrupt="pushToInterrupt" @finished="finished" <refresh ref="refresh" @interrupt="interrupt" @pushToInterrupt="pushToInterrupt" @finished="finished"
@scrolltolower="g" :scrollHeight="windowHeight" :scrollTop="scrollViewTop" @scroll="scroll"> @scrolltolower="g" :scrollHeight="windowHeight" :scrollTop="scrollViewTop" @scroll="scroll">
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
style="width: 139upx; height: 255upx; margin: auto; border-radius: 14px; overflow: hidden;" style="width: 139upx; height: 255upx; margin: auto; border-radius: 14px; overflow: hidden;"
:src="(item.image ? item.image:item.url) + '?x-oss-process=image/resize,lfit,w_112'" :src="(item.image ? item.image:item.url) + '?x-oss-process=image/resize,lfit,w_112'"
mode="aspectFit"></image> mode="aspectFit"></image>
<view v-if="type != 99"> <!-- <view v-if="type != 99">
<view v-if="Number(item.price) > 0 && type != 99 " style="min-width: 39upx; position: absolute; top: 0; right: 0; <view v-if="Number(item.price) > 0 && type != 99 " style="min-width: 39upx; position: absolute; top: 0; right: 0;
background: #EF5354; border-radius: 8upx 0upx 11upx 8upx; text-align: center; padding: 2upx 8upx; background: #EF5354; border-radius: 8upx 0upx 11upx 8upx; text-align: center; padding: 2upx 8upx;
font-size: 18upx; font-weight: bold; color: #FFFFFF;">￥{{item.price}}</view> font-size: 18upx; font-weight: bold; color: #FFFFFF;">￥{{item.price}}</view>
</view> </view> -->
</view> </view>
</view> </view>
<view class="align-center" <view class="align-center"
......
pages/index/components/switchBrands.vue
...@@ -103,12 +103,12 @@ ...@@ -103,12 +103,12 @@
<image :src="item.goods_pic" mode="aspectFit" <image :src="item.goods_pic" mode="aspectFit"
style="width: 160upx; height: 160upx; margin: auto; display: block;"></image> style="width: 160upx; height: 160upx; margin: auto; display: block;"></image>
<view style="font-size: 24upx;font-weight: 500; <view style="font-size: 24upx;font-weight: 500; background: #864BC3;
text-align: center; height: 66upx; text-align: center; height: 66upx;
overflow: hidden; width: 100%; overflow: hidden; width: calc(100% - 240upx);
display:-webkit-box; display:-webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2;" :class="[goods_id == item.id ? 'modelactive':'' ]">{{item.name || ''}} </view> -webkit-line-clamp: 3;" :class="[goods_id == item.id ? 'modelactive':'' ]">{{item.name || ''}} </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
......
pages/index/custom-size.vue
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
<!-- 自定义高度 --> <!-- 自定义高度 -->
<view style="display: flex;align-items: center; margin-left: 20upx; margin-top: 20upx;"> <view style="display: flex;align-items: center; margin-left: 20upx; margin-top: 20upx;">
<!-- <view style="font-size: 28upx; font-weight: 400; color: #FFFFFF; width: 155upx;">上边距:</view> -->
<view style="width: calc(100% - 70upx); height: 66upx; background: #282932; border-radius: 30upx; <view style="width: calc(100% - 70upx); height: 66upx; background: #282932; border-radius: 30upx;
display: flex;align-items: center "> display: flex;align-items: center ">
<input type="digit" placeholder="请输入上边距" @input="changeTop" :value="printTop" <input type="digit" placeholder="请输入上边距" @input="changeTop" :value="printTop"
...@@ -48,7 +47,6 @@ ...@@ -48,7 +47,6 @@
</view> </view>
<view <view
style="display: flex; align-items: center; margin-left: 20upx; margin-top: 20upx; position: relative;"> style="display: flex; align-items: center; margin-left: 20upx; margin-top: 20upx; position: relative;">
<!-- <view style="font-size: 28upx; font-weight: 400; color: #FFFFFF;width: 155upx;">左边距:</view> -->
<view style="width: calc(100% - 70upx);; height: 66upx; background: #282932; border-radius: 30upx; <view style="width: calc(100% - 70upx);; height: 66upx; background: #282932; border-radius: 30upx;
display: flex; align-items: center;"> display: flex; align-items: center;">
<input type="digit" :value="printLeft" placeholder="请输入左边距" @input="changeLeft" <input type="digit" :value="printLeft" placeholder="请输入左边距" @input="changeLeft"
...@@ -74,7 +72,6 @@ ...@@ -74,7 +72,6 @@
style="width: 48upx; height: 48upx; margin-left: 10upx;" mode="widthFix" style="width: 48upx; height: 48upx; margin-left: 10upx;" mode="widthFix"
@click="showUpdateRule(3)"> </image> @click="showUpdateRule(3)"> </image>
</view> </view>
<!-- 自定义高度 --> <!-- 自定义高度 -->
<view style="display: flex; align-items: center; margin-left: 20upx; margin-top: 20upx;"> <view style="display: flex; align-items: center; margin-left: 20upx; margin-top: 20upx;">
<!-- <view style="font-size: 28upx; font-weight: 400; color: #FFFFFF;width: 155upx;">高度:</view> --> <!-- <view style="font-size: 28upx; font-weight: 400; color: #FFFFFF;width: 155upx;">高度:</view> -->
...@@ -116,8 +113,7 @@ ...@@ -116,8 +113,7 @@
style=" width: 30upx; padding: 20upx; float:right; " mode="widthFix"> style=" width: 30upx; padding: 20upx; float:right; " mode="widthFix">
</image> </image>
</view> </view>
<image style="width: 558upx; position: absolute; top:0;left: 0; z-index: 2;" :src="tipImageUrl" <image style="width: 558upx; position: absolute; top:0;left: 0; z-index: 2;" :src="tipImageUrl" mode="widthFix"/>
mode="widthFix" />
</view> </view>
</uni-popup> </uni-popup>
......
pages/index/nick-name.vue
...@@ -4,13 +4,21 @@ ...@@ -4,13 +4,21 @@
<button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar"> <button type="balanced" open-type="chooseAvatar" @chooseavatar="onChooseavatar">
<image :src="avatarUrl" class="refreshIcon"></image> <image :src="avatarUrl" class="refreshIcon"></image>
</button> </button>
<view style="margin: auto; width: 100%; text-align: center;color: #999; margin-top: 0upx; ">点击获取微信头像</view>
</view> </view>
<view class="nickname">
<text>昵称：</text> <view class="nickname" style="background: #61D119; margin-top: 40upx;">
<input type="nickname" class="weui-input" :value="nickName" @blur="bindblur" placeholder="请输入昵称" <!--<text>昵称：</text> -->
@input="bindinput" /> <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 class="btn">
<view class="btn-sub" @tap="getUserProfile">保存</view>
</view> </view>
<view class="btn"> <view class="btn">
<view class="btn-sub" @click="onSubmit">保存</view> <view class="btn-sub" @click="onSubmit">保存</view>
</view> </view>
...@@ -19,8 +27,6 @@ ...@@ -19,8 +27,6 @@
</template> </template>
<script> <script>
import Env from '@/util/Env.js'; import Env from '@/util/Env.js';
export default { export default {
data() { data() {
...@@ -61,18 +67,6 @@ ...@@ -61,18 +67,6 @@
uni.showLoading({ uni.showLoading({
title: '头像上传中...' title: '头像上传中...'
}); });
// uni.request({
// url: Env.getDevBaseURL() + '/api/AliossSign/getSign',
// method: 'GET',
// data: '',
// header: {
// 'content-type': 'application/x-www-form-urlencoded',
// 'Accept': 'application/json'
// },
// success: function(res) {
// },
// });
} }
}, },
...@@ -115,29 +109,44 @@ ...@@ -115,29 +109,44 @@
} }
.nickname { .nickname {
background: #fff; background: #61D119;
padding: 20upx 30upx 80upx; padding: 20upx 30upx 20upx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border: 1upx solid #61D119;
width: 290upx;
height: 40upx;
margin: auto;
font-size: 32upx;
color: #fff;
border-radius: 60upx;
.weui-input { .weui-input {
padding-left: 60upx; text-align: center;
//padding-left: 40upx;
} }
} }
.my-input-placeholder {
color: #fff;
}
.btn { .btn {
width: 100%; width: 100%;
margin-top: 80upx;
.btn-sub { .btn-sub {
width: 670upx; //width: 670upx;
margin: 80upx auto 0; width: 200upx;
height: 90upx; //height: 40upx;
background: #DF8585; /* margin: 80upx auto 0; */
height: 85upx;
margin: auto;
background: #61D119;
border-radius: 45upx; border-radius: 45upx;
line-height: 90upx; line-height: 85upx;
text-align: center; text-align: center;
font-size: 36upx; font-size: 32upx;
color: #fff; color: #fff;
} }
} }
......
pages/index/start-up.vue
...@@ -102,17 +102,25 @@ ...@@ -102,17 +102,25 @@
<view style="width: calc(100% - 150upx); height: calc(100% - 180upx); position: relative;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; "> border: 4upx solid #61D119; margin-top: 140upx; margin-right: 10upx; ">
<veiw>
<scroll-view scroll-y style="width:100%; margin: auto; height:calc(100% - 50upx); overflow: hidden; margin-top: 10upx;"> <scroll-view scroll-y style="width:100%; margin: auto; height:calc(100% - 50upx); overflow: hidden; margin-top: 10upx;">
<view style="float: left; width: calc(100% / 4); margin: 5upx 0 5upx; " <view style="float: left; width: calc(100% / 4); margin: 5upx 0 5upx; "
v-for="(item, index) in datalist" :key="index" @click="modeDetail(item)"> v-for="(item, index) in datalist" :key="index" @click="modeDetail(item)">
<view style="width: 130upx; height: 255upx; margin: auto; position: relative;"> <view style="width: 135upx; height: 255upx; margin: auto; position: relative;">
<view style="display: flex;flex-direction: column;"> <view style="display: flex;flex-direction: column;">
<image <image
style="width: 130upx; height: 175upx; margin: auto; border-radius: 14px; overflow: hidden;" style="width: 132upx; height: 175upx; margin: auto; border-radius: 14px; overflow: hidden;"
:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_112'" :src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_112'"
mode="aspectFit"></image> mode="aspectFit"></image>
<view style=" margin-top: 3upx; text-align: center; font-size: 23upx; color: #000; font-weight:600">{{item.name}}</view> <text
style="
margin-top: 3upx;
text-align: center;
font-size: 24upx;
color: #000;
font-weight:bold;
word-break: break-word;
white-space: normal">{{item.name}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -125,7 +133,7 @@ ...@@ -125,7 +133,7 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</veiw>
</view> </view>
...@@ -151,7 +159,6 @@ ...@@ -151,7 +159,6 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
...@@ -166,6 +173,7 @@ ...@@ -166,6 +173,7 @@
import uniPopup from './common/uni-popup/uni-popup.vue' import uniPopup from './common/uni-popup/uni-popup.vue'
import myhead from './head/head.vue'; import myhead from './head/head.vue';
import Signin from '../index/Signin.vue'; import Signin from '../index/Signin.vue';
//import Signin from '../index/nick-name.vue';
import userService from '@/service/UserService'; import userService from '@/service/UserService';
import FrImage from '@/components/fr-image/fr-image.vue' import FrImage from '@/components/fr-image/fr-image.vue'
import switchBrands from './components/switchBrands.vue'; // 手机壳 import switchBrands from './components/switchBrands.vue'; // 手机壳
...@@ -230,7 +238,6 @@ ...@@ -230,7 +238,6 @@
cancel(type) { cancel(type) {
this.isShowPop = false this.isShowPop = false
//this.$refs['showshare'].close()
}, },
//关闭所有弹窗回调事件 //关闭所有弹窗回调事件
...@@ -238,7 +245,6 @@ ...@@ -238,7 +245,6 @@
}, },
modeDetail(item) { modeDetail(item) {
this.brandsitem = item this.brandsitem = item
homeservice.queryList({ homeservice.queryList({
...@@ -255,17 +261,9 @@ ...@@ -255,17 +261,9 @@
goods_id: this.brandsitem.id, // 产品id goods_id: this.brandsitem.id, // 产品id
dict_id: result.dict_id, // 产品属性 dict_id: result.dict_id, // 产品属性
} }
this.goodsbrands({goods_id_e: this.goods_id_e}) this.goodsbrands({goods_id_e: this.goods_id_e})
/* this.$emit('goodsbrands', {
goods_id_e: this.goods_id_e,
}) */
}).catch(err => { }).catch(err => {
// uni.showToast({
// title: err.msg,
// icon: 'none'
// });
}); });
}, },
...@@ -384,7 +382,6 @@ ...@@ -384,7 +382,6 @@
this.goods_id = obj.goods_id_e.goods_id //产品id this.goods_id = obj.goods_id_e.goods_id //产品id
this.dict_id = obj.goods_id_e.dict_id //产品属性id this.dict_id = obj.goods_id_e.dict_id //产品属性id
this.changeChannel() this.changeChannel()
this.isShowPop =false this.isShowPop =false
}, },
...@@ -631,6 +628,7 @@ ...@@ -631,6 +628,7 @@
old_sn: this.sn old_sn: this.sn
}).then(result => { }).then(result => {
this.$base.lockInventory = result //锁库存储存信息 this.$base.lockInventory = result //锁库存储存信息
this.$base.lockInventory.dict_id = this.dict_id
this.sn = result.sn this.sn = result.sn
uni.navigateTo({ uni.navigateTo({
...@@ -919,7 +917,6 @@ ...@@ -919,7 +917,6 @@
} }
.scroll-item-select{ .scroll-item-select{
//border: 1upx solid #61D119;
border-top: 5upx solid #61D119; border-top: 5upx solid #61D119;
border-bottom: 5upx solid #61D119; border-bottom: 5upx solid #61D119;
border-left: 5upx solid #61D119; border-left: 5upx solid #61D119;
......
static/icon_diy_ai.png
static/icon_diy_ai.png

671 Bytes | W: | H:

static/icon_diy_ai.png

205 Bytes | W: | H:

static/icon_diy_ai.png
static/icon_diy_ai.png
static/icon_diy_ai.png
static/icon_diy_ai.png
  • 2-up
  • Swipe
  • Onion skin
util/Env.js
...@@ -5,8 +5,8 @@ if(!accountInfo.miniProgram.envVersion){ ...@@ -5,8 +5,8 @@ if(!accountInfo.miniProgram.envVersion){
const baseApi = { const baseApi = {
//开发版 //开发版
develop: "https://kxz.refinecolor.com", //develop: "https://kxz.refinecolor.com",
//develop: "https://print.kexiaozhan.cn", develop: "https://print.kexiaozhan.cn",
//体验版 //体验版
trial: "https://kxz.refinecolor.com", 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