Commit 2d45064b by huahua

提交

parent ab898630
......@@ -17,14 +17,16 @@
<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>
<view class="nickname" style="background: #fff;">
<text>昵称:</text>
<input type="nickname" class="weui-input" :value="nickName" @blur="bindblur" placeholder="请输入昵称"
@input="bindinput"/>
<!-- <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> -->
<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>
......@@ -105,7 +107,7 @@
},
bindinput(e) {
console.log('nickName', e)
//console.log('nickName', e)
this.nickName = e.detail.value;
},
......@@ -138,8 +140,7 @@
}
uni.getSetting({
success(res) {
//console.log('获取用户信息是否用户同意')
//console.log(res.authSetting)
}
})
let that = this;
......@@ -373,7 +374,7 @@
}
.avatarUrl {
padding: 70upx 0 40upx;
padding: 40upx 0 40upx;
background: #fff;
button {
......@@ -381,7 +382,7 @@
line-height: 80upx;
height: auto;
width: auto;
padding: 20upx 30upx;
padding: 20upx 10upx;
margin: 0;
display: flex;
justify-content: center;
......@@ -406,29 +407,44 @@
}
.nickname {
background: #EEE;
padding: 20upx 30upx 80upx;
background: #61D119;
padding: 20upx 30upx 20upx;
display: flex;
align-items: center;
justify-content: center;
border: 1upx solid #61D119;
width: 290upx;
height: 40upx;
margin: auto;
font-size: 32upx;
color: #fff;
border-radius: 60upx;
.weui-input {
padding-left: 60upx;
text-align: center;
//padding-left: 40upx;
}
}
.my-input-placeholder {
color: #fff;
}
.btn {
width: 100%;
margin-top: 80upx;
.btn-sub {
width: 670upx;
margin: 80upx auto 0;
height: 90upx;
background: #DF8585;
//width: 670upx;
width: 200upx;
//height: 40upx;
/* margin: 80upx auto 0; */
height: 85upx;
margin: auto;
background: #61D119;
border-radius: 45upx;
line-height: 90upx;
line-height: 85upx;
text-align: center;
font-size: 36upx;
font-size: 32upx;
color: #fff;
}
}
......
<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}">
<refresh ref="refresh" @interrupt="interrupt" @pushToInterrupt="pushToInterrupt" @finished="finished"
@scrolltolower="g" :scrollHeight="windowHeight" :scrollTop="scrollViewTop" @scroll="scroll">
......@@ -17,11 +17,11 @@
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'"
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;
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>
</view>
</view> -->
</view>
</view>
<view class="align-center"
......
......@@ -103,12 +103,12 @@
<image :src="item.goods_pic" mode="aspectFit"
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;
overflow: hidden; width: 100%;
overflow: hidden; width: calc(100% - 240upx);
display:-webkit-box;
-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>
</scroll-view>
</view>
......
......@@ -35,7 +35,6 @@
<!-- 自定义高度 -->
<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;
display: flex;align-items: center ">
<input type="digit" placeholder="请输入上边距" @input="changeTop" :value="printTop"
......@@ -48,7 +47,6 @@
</view>
<view
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;
display: flex; align-items: center;">
<input type="digit" :value="printLeft" placeholder="请输入左边距" @input="changeLeft"
......@@ -74,14 +72,13 @@
style="width: 48upx; height: 48upx; margin-left: 10upx;" mode="widthFix"
@click="showUpdateRule(3)"> </image>
</view>
<!-- 自定义高度 -->
<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;
display: flex; align-items: center;">
<input type="digit" placeholder="请输入宽度" @input="changeHeight" :value="printHeight"
style="color: #FFFFFF; font-size: 28upx; padding-left: 35upx;width: calc(100% - 90upx);" />
style="color: #FFFFFF; font-size: 28upx; padding-left: 35upx;width: calc(100% - 90upx);" />
<view style="color: #898989; font-size: 26upx; width: 82upx;">{{companyValue}}</view>
</view>
<image src="../../static/icon_custom_tips.png"
......@@ -116,8 +113,7 @@
style=" width: 30upx; padding: 20upx; float:right; " mode="widthFix">
</image>
</view>
<image style="width: 558upx; position: absolute; top:0;left: 0; z-index: 2;" :src="tipImageUrl"
mode="widthFix" />
<image style="width: 558upx; position: absolute; top:0;left: 0; z-index: 2;" :src="tipImageUrl" mode="widthFix"/>
</view>
</uni-popup>
......
......@@ -4,23 +4,29 @@
<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>
<view class="nickname">
<text>昵称:</text>
<input type="nickname" class="weui-input" :value="nickName" @blur="bindblur" placeholder="请输入昵称"
@input="bindinput" />
<view class="nickname" style="background: #61D119; margin-top: 40upx;">
<!--<text>昵称:</text> -->
<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 class="btn">
<view class="btn-sub" @click="onSubmit">保存</view>
</view>
</view>
</template>
<script>
import Env from '@/util/Env.js';
export default {
data() {
......@@ -29,27 +35,27 @@
nickName: ''
};
},
onLoad(option) {
},
methods: {
bindblur(e) {
console.log('nickName', e)
this.nickName = e.detail.value;
},
bindinput(e) {
console.log('nickName', e)
this.nickName = e.detail.value;
},
onChooseavatar(e) {
this.avatarUrl = e.detail.avatarUrl;
},
onSubmit() {
if (this.nickName === '') {
uni.showToast({
......@@ -61,22 +67,10 @@
uni.showLoading({
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) {
// },
// });
}
},
}
},
};
</script>
<style lang="scss">
......@@ -114,32 +108,47 @@
border: none;
}
.nickname {
background: #fff;
padding: 20upx 30upx 80upx;
.nickname {
background: #61D119;
padding: 20upx 30upx 20upx;
display: flex;
align-items: center;
justify-content: center;
border: 1upx solid #61D119;
width: 290upx;
height: 40upx;
margin: auto;
font-size: 32upx;
color: #fff;
border-radius: 60upx;
.weui-input {
padding-left: 60upx;
text-align: center;
//padding-left: 40upx;
}
}
.my-input-placeholder {
color: #fff;
}
.btn {
width: 100%;
margin-top: 80upx;
.btn-sub {
width: 670upx;
margin: 80upx auto 0;
height: 90upx;
background: #DF8585;
//width: 670upx;
width: 200upx;
//height: 40upx;
/* margin: 80upx auto 0; */
height: 85upx;
margin: auto;
background: #61D119;
border-radius: 45upx;
line-height: 90upx;
line-height: 85upx;
text-align: center;
font-size: 36upx;
font-size: 32upx;
color: #fff;
}
}
}
}
</style>
\ No newline at end of file
......@@ -102,17 +102,25 @@
<view style="width: calc(100% - 150upx); height: calc(100% - 180upx); position: relative;overflow: hidden;
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;">
<view style="float: left; width: calc(100% / 4); margin: 5upx 0 5upx; "
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;">
<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'"
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>
......@@ -125,7 +133,7 @@
</view>
</view>
</scroll-view>
</veiw>
</view>
......@@ -150,8 +158,7 @@
</view>
</view>
</view>
</view>
</view>
......@@ -166,6 +173,7 @@
import uniPopup from './common/uni-popup/uni-popup.vue'
import myhead from './head/head.vue';
import Signin from '../index/Signin.vue';
//import Signin from '../index/nick-name.vue';
import userService from '@/service/UserService';
import FrImage from '@/components/fr-image/fr-image.vue'
import switchBrands from './components/switchBrands.vue'; // 手机壳
......@@ -230,7 +238,6 @@
cancel(type) {
this.isShowPop = false
//this.$refs['showshare'].close()
},
//关闭所有弹窗回调事件
......@@ -238,7 +245,6 @@
},
modeDetail(item) {
this.brandsitem = item
homeservice.queryList({
......@@ -255,17 +261,9 @@
goods_id: this.brandsitem.id, // 产品id
dict_id: result.dict_id, // 产品属性
}
this.goodsbrands({goods_id_e: this.goods_id_e})
/* this.$emit('goodsbrands', {
goods_id_e: this.goods_id_e,
}) */
}).catch(err => {
// uni.showToast({
// title: err.msg,
// icon: 'none'
// });
});
},
......@@ -384,7 +382,6 @@
this.goods_id = obj.goods_id_e.goods_id //产品id
this.dict_id = obj.goods_id_e.dict_id //产品属性id
this.changeChannel()
this.isShowPop =false
},
......@@ -631,6 +628,7 @@
old_sn: this.sn
}).then(result => {
this.$base.lockInventory = result //锁库存储存信息
this.$base.lockInventory.dict_id = this.dict_id
this.sn = result.sn
uni.navigateTo({
......@@ -782,10 +780,10 @@
var that = this;
wx.getSystemInfo({
success: function(res) {
let pixelRate = res.windowWidth / 750;
that.data.windowWidth = res.windowWidth // 屏幕宽度
that.data.windowHeight = res.windowHeight // 屏幕高度
that.data.pixelRate = pixelRate
let pixelRate = res.windowWidth / 750;
that.data.windowWidth = res.windowWidth // 屏幕宽度
that.data.windowHeight = res.windowHeight // 屏幕高度
that.data.pixelRate = pixelRate
}
})
},
......@@ -919,7 +917,6 @@
}
.scroll-item-select{
//border: 1upx solid #61D119;
border-top: 5upx solid #61D119;
border-bottom: 5upx solid #61D119;
border-left: 5upx solid #61D119;
......
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
......@@ -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