Skip to content

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

提交

parent ab898630
Showing with 183 additions and 363 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,14 +72,13 @@ ...@@ -74,14 +72,13 @@
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> -->
<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="changeHeight" :value="printHeight" <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 style="color: #898989; font-size: 26upx; width: 82upx;">{{companyValue}}</view>
</view> </view>
<image src="../../static/icon_custom_tips.png" <image src="../../static/icon_custom_tips.png"
...@@ -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/index.vue
...@@ -286,8 +286,7 @@ ...@@ -286,8 +286,7 @@
<!-- 图片提示 --> <!-- 图片提示 -->
<view v-if="showone"> <view v-if="showone">
<view <view style="position: fixed; z-index:999; width: 100%; height: 100%; background:rgba(0,0,0,0.6); top: 0;"
style="position: fixed; z-index:999; width: 100%; height: 100%; background:rgba(0,0,0,0.6); top: 0;"
@click.stop="showone = !showone"></view> @click.stop="showone = !showone"></view>
<view style="position: fixed; background: #FFFFFF; top:calc((100% - 621upx) / 2); left:calc((100% - 560upx) / 2); <view style="position: fixed; background: #FFFFFF; top:calc((100% - 621upx) / 2); left:calc((100% - 560upx) / 2);
z-index:1000; width: 560upx; min-height: 621upx; border-radius: 12upx;"> z-index:1000; width: 560upx; min-height: 621upx; border-radius: 12upx;">
...@@ -318,47 +317,50 @@ ...@@ -318,47 +317,50 @@
<!-- 菜单栏目 --> <!-- 菜单栏目 -->
<view v-if="!active && !guide_left" class="toolRight" > <view v-if="!active && !guide_left" class="toolRight" >
<view class="tool_li" @click="selectPicturePop()" style="margin-top: 22upx;"> <view class="tool_li" @click="selectPicturePop()" style="margin-top: 22upx;">
<image class="tool_li_img" src="../../static/icon_make_diy_back_color.png" <image class="tool_li_img" src="../../static/icon_make_diy_back_color.png"
style="width: 60upx;height: 60upx;" mode="aspectFit"></image> style="width: 60upx;height: 60upx;" mode="aspectFit"></image>
<view class="tool_li_text">上传相片</view> <view class="tool_li_text">上传相片</view>
</view> </view>
<view class="tool_li" @click="showPopup(3)" style="margin-top: 22upx;"> <view class="tool_li" @click="showPopup(3)" style="margin-top: 22upx;">
<image class="tool_li_img" src="../../static/icon/icon_typeface.png" style="width: 50upx;height: 50upx;" mode="aspectFit"></image> <image class="tool_li_img" src="../../static/icon/icon_typeface.png" style="width: 50upx;height: 50upx;" mode="aspectFit"></image>
<view class="tool_li_text">添加文字</view> <view class="tool_li_text">添加文字</view>
</view> </view>
<view class="tool_li" @click="showPopup(2)"> <view class="tool_li" @click="showPopup(2)">
<image class="tool_li_img" src="../../static/icon/icon_stickers.png" mode="aspectFit"></image> <image class="tool_li_img" src="../../static/icon/icon_stickers.png" mode="aspectFit"></image>
<view class="tool_li_text">推荐图片</view> <view class="tool_li_text">推荐图片</view>
</view> </view>
<view class="tool_li" @click="showAiChange()"> <view class="tool_li" @click="showAiChange()">
<image @click="cancel('share')" class="tool_li_img" <image @click="cancel('share')" class="tool_li_img"
src="../../static/icon_diy_ai.png" mode="aspectFit" src="../../static/icon_diy_ai.png" mode="aspectFit" style="width: 50upx;height: 50upx;"></image>
style=" width: 50upx;height: 50upx;"></image> <view class="tool_li_text">优化图片</view>
</view> </view>
</view> </view>
<tuya ref="tuya" @tuyaimg="tuyaimg"></tuya> <tuya ref="tuya" @tuyaimg="tuyaimg"></tuya>
<!-- 编辑文字跟图片按钮 --> <!-- 编辑文字跟图片按钮 -->
<view v-if="active && !guide_left" style="position: fixed;top: 718upx;right: 26upx; z-index: 99999;"> <view v-if="active && !guide_left" style="position: fixed;top: 718upx;right:0upx; z-index: 99999; width: 120upx;height: 130upx;">
<view style="width: 100%;height: 130upx;"> <view style="width: 100%;height: 130upx;">
<!-- 点击画布区域取消聚焦 --> <!-- 点击画布区域取消聚焦 -->
<view style="width: 100%;height: 90upx;" @click.stop="itemCancel"> <view style="width: 100%;height: 60upx;margin-left: 36upx;" @click.stop="itemCancel">
<image style="width: 50upx; height: 50upx;" <image style="width: 50upx; height: 70upx;"
src="../../static/icon_confirm.png" mode="aspectFit"></image> src="../../static/icon_confirm.png" mode="aspectFit"></image>
</view> </view>
<!-- AI图像 --> <!-- AI图像 -->
<view v-if="data.itemList.length > 0"> <!-- <view v-if="data.itemList.length > 0">
<view style="height: 90upx;width: 100%;" @click="showAiChange()"> <view style="height: 60upx;width: 100%;margin-left: 36upx;margin-top: 21upx;" @click="showAiChange()">
<image class="tool_li_img" style="width: 50upx; height: 50upx;" <image class="tool_li_img" style="width: 50upx; height: 70upx;"
src="../../static/icon_diy_ai.png" mode="aspectFit" ></image> src="../../static/icon_diy_ai.png" mode="aspectFit" ></image>
</view> </view>
</view> <view style="text-align: center;
color: #FFFFFF;
font-size: 22upx;
margin-top: 10upx;width: 100%;">优化图片</view>
</view> -->
<view v-if="data.itemList.length > 0"> <view v-if="data.itemList.length > 0">
<view style="height: 60upx;width: 100%;" @click="showPopup(4)" v-if="data.itemList[data.cidx].type == 1"> <view style="height: 60upx;width: 100%;" @click="showPopup(4)" v-if="data.itemList[data.cidx].type == 1">
<image class="tool_li_img" style="width: 50upx; height: 50upx;" <image class="tool_li_img" style="width: 50upx; height: 50upx;"
...@@ -455,7 +457,7 @@ ...@@ -455,7 +457,7 @@
style="width: 60upx; height: 60upx; display: block;margin:auto; padding: 18upx;" style="width: 60upx; height: 60upx; display: block;margin:auto; padding: 18upx;"
:src="index == currentId ? item.icon_click : item.icon" mode="aspectFill"> :src="index == currentId ? item.icon_click : item.icon" mode="aspectFill">
</image> </image>
<view v-if="item.update_flag == 1" <!-- <view v-if="item.update_flag == 1"
style="width: 20upx; style="width: 20upx;
height: 20upx; height: 20upx;
margin-left: 80upx; margin-left: 80upx;
...@@ -464,7 +466,7 @@ ...@@ -464,7 +466,7 @@
border-radius: 50%; border-radius: 50%;
margin-top: -80upx; margin-top: -80upx;
position: absolute;"> position: absolute;">
</view> </view> -->
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
...@@ -576,13 +578,10 @@ ...@@ -576,13 +578,10 @@
</view> </view>
</uni-popup> </uni-popup>
<view v-if="isShowPop" <view v-if="isShowPop"
style="z-index: 999999; width: 100%;background: #55ff7f; height: 100%; position: absolute; top: 0upx; left: 0upx" :style="{height: data.windowHeight +'px'}"> style="z-index: 999999; width: 100%;background: #55ff7f; 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 class="uni-share full-width" :style="{height: data.windowHeight +'px'}" style="background: #fff;">
<view style="position: absolute; bottom: 0upx; left: 0; <view style="position: absolute; bottom: 0upx; left: 0;height: 100%; width: 120upx; z-index: 7; overflow: hidden;">
height: 100%; width: 120upx;
z-index: 7;
overflow: hidden;">
<view style="width: 120upx; height: 190upx;"></view> <view style="width: 120upx; height: 190upx;"></view>
<view style="width: 112upx; padding-left: 8upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}"> <view style="width: 112upx; padding-left: 8upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container" <scroll-view class="scroll-container"
...@@ -607,13 +606,20 @@ ...@@ -607,13 +606,20 @@
<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>
...@@ -626,8 +632,8 @@ ...@@ -626,8 +632,8 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</veiw> </veiw>
</view> </view>
<view style="position: absolute; bottom: 0upx; left: 0; <view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 5upx; height: 100%; width: 5upx;
z-index: 9; z-index: 9;
...@@ -639,7 +645,6 @@ ...@@ -639,7 +645,6 @@
<view :id="'s' + index" style="height: 140upx;" <view :id="'s' + index" style="height: 140upx;"
:class="[index == brandCurrentId ? 'scroll-item-buttom-select' : 'scroll-item-buttom-no-select']" :class="[index == brandCurrentId ? 'scroll-item-buttom-select' : 'scroll-item-buttom-no-select']"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)" > 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> </view>
</scroll-view> </scroll-view>
</view> </view>
...@@ -976,13 +981,10 @@ ...@@ -976,13 +981,10 @@
//显示Ai转换 //显示Ai转换
showAiChange() { showAiChange() {
if(this.data == null){ if(this.data == null ){
return
}
if(!this.active){
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: "还没选中图片", title: "上传人物图片",
duration: 2000 duration: 2000
}); });
return return
...@@ -990,12 +992,12 @@ ...@@ -990,12 +992,12 @@
if(this.data.itemList == null || this.data.itemList.length == 0){ if(this.data.itemList == null || this.data.itemList.length == 0){
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: "还没选中图片", title: "上传人物图片",
duration: 2000 duration: 2000
}); });
return return
} }
if(this.data.itemList[this.data.cidx].type == 0 && this.data.itemList[this.data.cidx].isUpLoadImage){ if(this.data.itemList[this.data.itemList.length-1].type == 0 && this.data.itemList[this.data.itemList.length-1].isUpLoadImage){
this.selectChangeType = 1; this.selectChangeType = 1;
this.$refs["showAiChange"].open(); this.$refs["showAiChange"].open();
}else{ }else{
...@@ -1236,8 +1238,7 @@ ...@@ -1236,8 +1238,7 @@
under_color: '', under_color: '',
content: e, // 图片地址 content: e, // 图片地址
top: this.editor_top - this.data.editorHeight / 2, // 初始图片Y坐标，根据画布高/2-图片高/2 top: this.editor_top - this.data.editorHeight / 2, // 初始图片Y坐标，根据画布高/2-图片高/2
left: this.data.editorWidth / 2 - this.data.editorWidth / left: this.data.editorWidth / 2 - this.data.editorWidth / 2, // 初始图片X坐标,因为div是相对定位，所以计算是要多减一次移动的距离
2, // 初始图片X坐标,因为div是相对定位，所以计算是要多减一次移动的距离
x: this.data.editorWidth / 2, // 初始圆心位置，可再downImg之后又宽高和初始的图片位置得出 x: this.data.editorWidth / 2, // 初始圆心位置，可再downImg之后又宽高和初始的图片位置得出
y: this.editor_top, y: this.editor_top,
scale: 1, // 缩放比例 1为不缩放 scale: 1, // 缩放比例 1为不缩放
...@@ -1924,21 +1925,17 @@ ...@@ -1924,21 +1925,17 @@
if (this.machine_id != undefined && this.machine_id != null && this.machine_id != '') { if (this.machine_id != undefined && this.machine_id != null && this.machine_id != '') {
// 判断设备是否正常 // 判断设备是否正常
that.isComeDelivery = false; that.isComeDelivery = false;
this.available = this.machineDetail.available //禁用下订单 this.available = this.machineDetail.available //禁用下订单
if (this.available == 0) { if (this.available == 0) {
this.createWorkstext = '暂时缺货' this.createWorkstext = '暂时缺货'
} }
//判断配送版 //判断配送版
if (this.machineDetail.delivery == 1 && this.machineDetail.machine_category_id == "64") { if (this.machineDetail.delivery == 1 && this.machineDetail.machine_category_id == "64") {
//this.key = 1; //this.key = 1;
this.isComeDelivery = true; this.isComeDelivery = true;
} //key:null,//1直营配送站 2 万能通用版 3色彩自助站 } //key:null,//1直营配送站 2 万能通用版 3色彩自助站
this.$base.coupon_flag_desc = this.machineDetail.coupon_flag_desc this.$base.coupon_flag_desc = this.machineDetail.coupon_flag_desc
this.support_pay = this.machineDetail.support_pay //单机版是否支付 this.support_pay = this.machineDetail.support_pay //单机版是否支付
//console.log("this.support_pay=" + res.support_pay)
// 先登陆 // 先登陆
uni.login({ uni.login({
provider: 'weixin', provider: 'weixin',
...@@ -2173,9 +2170,7 @@ ...@@ -2173,9 +2170,7 @@
} }
this.self_help(loading, result.id) this.self_help(loading, result.id)
} else { } else {
/* uni.navigateTo({
url: '../mall/myworksDetail?id=' + result.id
}) */
} }
}).catch(err => { }).catch(err => {
uni.hideLoading(); uni.hideLoading();
...@@ -2229,46 +2224,9 @@ ...@@ -2229,46 +2224,9 @@
}); });
isclick = true; isclick = true;
}); });
/* if (this.support_pay == 1) {
uni.navigateTo({
url: '../mine/order?goodid=' + works_id + '&machine_id=' + this
.machine_id + '&goods_id=' +
this.data.goods_id + '&sn=' + this.sn + "&machineDetail=" +
encodeURIComponent(JSON.stringify(this.machineDetail)) + "&customize_size_id=" + this
.customize_size_id
})
setTimeout(function() {
isclick = true;
}, 5000)
} else {
uni.showLoading({
title: '正在生成订单...',
mask: true
})
homeservice.WorksList(data).then(result => {
// 关闭当前页面，跳转到应用内的某个页面。
uni.navigateTo({
url: '../mall/lineUp?machine_id=' + this.machine_id + '&key=' +
this.key
})
setTimeout(function() {
isclick = true;
}, 5000)
uni.hideLoading();
}).catch(err => {
loading = false;
uni.hideLoading();
uni.showToast({
title: err.msg || err.data,
icon: 'none'
});
isclick = true;
});
} */
}, },
payment(params, order_id) { payment(params, order_id) {
let seft = this let seft = this
uni.requestPayment({ uni.requestPayment({
...@@ -2292,7 +2250,6 @@ ...@@ -2292,7 +2250,6 @@
}, 1000) }, 1000)
}, },
fail: (err = {}) => { fail: (err = {}) => {
console.log('fail00:' + JSON.stringify(err || ''));
if (err.errMsg && err.errMsg.indexOf('cancel') === -1 || (!err.errMsg)) uni.showToast({ if (err.errMsg && err.errMsg.indexOf('cancel') === -1 || (!err.errMsg)) uni.showToast({
title: '网络异常,请稍后再试', title: '网络异常,请稍后再试',
icon: 'none', icon: 'none',
...@@ -2312,8 +2269,6 @@ ...@@ -2312,8 +2269,6 @@
key:"3" key:"3"
}).then(result => { }).then(result => {
this.brandList = result; this.brandList = result;
//this.isShowPop = true;
//this.$refs['showBrandShare'].open()
if(this.brandList != null && this.brandList.length > 0 ){ if(this.brandList != null && this.brandList.length > 0 ){
this.brandclick(0,this.brandList[0]) this.brandclick(0,this.brandList[0])
} }
...@@ -2345,7 +2300,6 @@ ...@@ -2345,7 +2300,6 @@
ev.preventDefault(); ev.preventDefault();
//获取当前选中的部件 //获取当前选中的部件
var item = items[index]; var item = items[index];
//点击
if (ev.touches.length == 1 && item != undefined) { if (ev.touches.length == 1 && item != undefined) {
if (item.typetext == "left-top" || item.typetext == "left-bottom" || item.typetext == if (item.typetext == "left-top" || item.typetext == "left-bottom" || item.typetext ==
"right-top" || item.typetext == "right-bottom") { "right-top" || item.typetext == "right-bottom") {
...@@ -2855,7 +2809,6 @@ ...@@ -2855,7 +2809,6 @@
} }
}, },
MaterialseriesList() { //查询分类下二级分类 MaterialseriesList() { //查询分类下二级分类
this.material_series_list = [] this.material_series_list = []
homeservice.queryList({ homeservice.queryList({
...@@ -2981,7 +2934,6 @@ ...@@ -2981,7 +2934,6 @@
title: "我的点赞" title: "我的点赞"
}, },
] ]
if (this.collection_currentId != 0) { if (this.collection_currentId != 0) {
this.currentId = this.collection_currentId; this.currentId = this.collection_currentId;
this.currentIndex = this.collection_currentIndex; this.currentIndex = this.collection_currentIndex;
...@@ -3012,7 +2964,6 @@ ...@@ -3012,7 +2964,6 @@
if (!this.isHasClick) { if (!this.isHasClick) {
return; return;
} }
//this.isShowGif = false;
this.$refs['show' + type].close() this.$refs['show' + type].close()
this.addtext = false this.addtext = false
if (wx.pageScrollTo) { if (wx.pageScrollTo) {
...@@ -3027,7 +2978,7 @@ ...@@ -3027,7 +2978,7 @@
typefaceshow(type) { typefaceshow(type) {
var item = items[index]; // 获取当前选中的部件 var item = items[index]; // 获取当前选中的部件
if (item != undefined && item.type == 1) { if (item != undefined && item.type == 1) {
// 字体 //字体
this.$refs['textsettingsshare'].open() this.$refs['textsettingsshare'].open()
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['textsettingstwo'].open({ this.$refs['textsettingstwo'].open({
...@@ -3448,8 +3399,6 @@ ...@@ -3448,8 +3399,6 @@
//点击画布区域取消聚焦 //点击画布区域取消聚焦
itemCancel(e) { itemCancel(e) {
//console.log('点击画布区域取消聚焦')
//this.isShowGif = false;
this.isShowMoveMaterial = true; this.isShowMoveMaterial = true;
this.drag_text_context = "单击可选中"; this.drag_text_context = "单击可选中";
this.cutting_text_context = "双击可裁剪"; this.cutting_text_context = "双击可裁剪";
...@@ -3470,7 +3419,6 @@ ...@@ -3470,7 +3419,6 @@
// this.setData({itemList: items}); // this.setData({itemList: items});
this.active = false this.active = false
} }
//uni.showToast({title: this.active+"",icon: 'none'});
}, },
/* 获取编辑区域左边距 */ /* 获取编辑区域左边距 */
...@@ -3675,12 +3623,10 @@ ...@@ -3675,12 +3623,10 @@
var mTop = this.getTop(); var mTop = this.getTop();
//移动的点到圆心的距离 //移动的点到圆心的距离
item.disPtoO = this.computeDistance(item.x, item.y, item.touchMoveX - mLeft, item item.disPtoO = this.computeDistance(item.x, item.y, item.touchMoveX - mLeft, item
.touchMoveY - .touchMoveY - mTop);
mTop);
//移动后位置的角度 //移动后位置的角度
item.angleNext = this.computeAngle(item.x, item.y, item.touchMoveX - mLeft, item item.angleNext = this.computeAngle(item.x, item.y, item.touchMoveX - mLeft, item
.touchMoveY - .touchMoveY - mTop);
mTop);
//角度差 //角度差
item.new_rotate = item.angleNext - item.anglePre; item.new_rotate = item.angleNext - item.anglePre;
//叠加的角度差 //叠加的角度差
...@@ -3762,19 +3708,16 @@ ...@@ -3762,19 +3708,16 @@
item.activehorn = true // 角状态 item.activehorn = true // 角状态
item.activeedge = true // 边状态 item.activeedge = true // 边状态
//赋值 //赋值
// this.data.listActive = false drag.getTransferPosition(item.left, item.top, item.width, item.height, item.angle, item.centerPos,item)
drag.getTransferPosition(item.left, item.top, item.width, item.height, item.angle, item
.centerPos,
item)
this.saveSnapshot(); this.saveSnapshot();
}, },
/* 部件旋转结束事件*/ /* 部件旋转结束事件*/
rotateEnd: function(e) { rotateEnd: function(e) {
// 获取当前选中的部件 //获取当前选中的部件
var item = items[index]; var item = items[index];
item.typetext = null; item.typetext = null;
//赋值 //赋值
// this.data.listActive = false
//关闭点击属性 //关闭点击属性
item.active = true //辅助线 item.active = true //辅助线
item.activeguide = false // 辅助线状态 item.activeguide = false // 辅助线状态
...@@ -4078,7 +4021,6 @@ ...@@ -4078,7 +4021,6 @@
item.index = item.index + 1; item.index = item.index + 1;
currentItem.index = currentItem.index - 1; currentItem.index = currentItem.index - 1;
this.data.itemList = items this.data.itemList = items
// this.setData({itemList:items});
this.saveSnapshot(); this.saveSnapshot();
break; break;
} }
...@@ -4173,10 +4115,8 @@ ...@@ -4173,10 +4115,8 @@
uni.getImageInfo({ uni.getImageInfo({
src: result.front_image, src: result.front_image,
success: (front_image) => { success: (front_image) => {
this.data.bgHeight = front_image.height * (this.data.bgWidth / front_image this.data.bgHeight = front_image.height * (this.data.bgWidth / front_image.width) // 画布高度
.width) // 画布高度 this.editory = result.center_scale * (this.data.bgWidth / front_image.width) //辅助线距离
this.editory = result.center_scale * (this.data.bgWidth / front_image
.width) //辅助线距离
this.front_image_long = true this.front_image_long = true
}, },
fail(err) { fail(err) {
...@@ -4212,7 +4152,6 @@ ...@@ -4212,7 +4152,6 @@
this.center_scale = result.center_scale // 设计区中心点比率 this.center_scale = result.center_scale // 设计区中心点比率
this.location_scale = result.location_scale // 辅助线比率 this.location_scale = result.location_scale // 辅助线比率
this.editor_top = this.data.editorHeight * Number(this.location_scale) //辅助线距离 this.editor_top = this.data.editorHeight * Number(this.location_scale) //辅助线距离
let scaleWidth = this.data.editorWidth / 100; let scaleWidth = this.data.editorWidth / 100;
let scaleHeight = this.data.editorHeight / 185; let scaleHeight = this.data.editorHeight / 185;
this.real_print_height = (this.options.HeightIndex / 3) * scaleWidth; // 设计宽度 this.real_print_height = (this.options.HeightIndex / 3) * scaleWidth; // 设计宽度
...@@ -4222,7 +4161,6 @@ ...@@ -4222,7 +4161,6 @@
this.clipTop = (this.data.editorHeight - this.real_print_height) / 2; this.clipTop = (this.data.editorHeight - this.real_print_height) / 2;
this.clipButtom = this.clipTop; this.clipButtom = this.clipTop;
this.filletSize = (this.options.fillet / 3) * scaleWidth; this.filletSize = (this.options.fillet / 3) * scaleWidth;
if (snapshot.length > 0) { if (snapshot.length > 0) {
let listSnapshot = [] let listSnapshot = []
snapshot.forEach((item, index) => { snapshot.forEach((item, index) => {
...@@ -4300,73 +4238,6 @@ ...@@ -4300,73 +4238,6 @@
snapshot = listSnapshot snapshot = listSnapshot
} }
/* this.setData({
functionHide: animation.export()
}) */
//进入页面动画
/* if (this.translateX != 0) {
// 初始化位置
//this.translateX = -((this.data.windowWidth - this.data.editorWidth) / 2 + this.data.editorWidth)
//this.translateX = - 800
// 手机壳缓缓移动进入 1s
setTimeout(function() {
this.translateX = 0
}.bind(this), 1000)
// 背景淡淡消失 1s
setTimeout(function() {
this.isReady = true; // 撒礼花特效
var animationDelLots = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animationDelLots.opacity(0).step()
this.setData({
translateXState: animationDelLots.export()
})
let animation = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animation.opacity(1).step()
this.setData({
translateHide: animation.export()
})
}.bind(this), 2000)
//手机顶部盒子离开视线 2s
setTimeout(function() {
let animationDelLots = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animationDelLots.translate(-((this.data.windowWidth - this.data.editorWidth) /
2 + this.data.editorWidth) * 2, 0).step(); //向左移动
this.setData({
translateLeft: animationDelLots.export()
})
}.bind(this), 3000)
//显示功能按钮
setTimeout(function() {
this.isReady = false; // 消失礼花
let animation = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animation.opacity(1).step()
this.setData({
functionHide: animation.export()
})
}.bind(this), 4000)
} else {
setTimeout(function() {
this.isReady = true;
}.bind(this), 200)
setTimeout(function() {
this.isReady = false;
}.bind(this), 4000)
} */
}).catch(err => { }).catch(err => {
this.goodslistAgain(); this.goodslistAgain();
}); });
...@@ -4387,10 +4258,8 @@ ...@@ -4387,10 +4258,8 @@
uni.getImageInfo({ uni.getImageInfo({
src: result.front_image, src: result.front_image,
success: (front_image) => { success: (front_image) => {
this.data.bgHeight = front_image.height * (this.data.bgWidth / front_image this.data.bgHeight = front_image.height * (this.data.bgWidth / front_image.width) // 画布高度
.width) // 画布高度 this.editory = result.center_scale * (this.data.bgWidth / front_image.width) //辅助线距离
this.editory = result.center_scale * (this.data.bgWidth / front_image
.width) //辅助线距离
this.front_image_long = true this.front_image_long = true
}, },
fail(err) { fail(err) {
...@@ -4438,57 +4307,6 @@ ...@@ -4438,57 +4307,6 @@
} }
//进入页面动画 //进入页面动画
if (this.translateX != 0) { if (this.translateX != 0) {
// 初始化位置
/* this.translateX = -((this.data.windowWidth - this.data.editorWidth) / 2 + this.data.editorWidth)
// 手机壳缓缓移动进入 1s
setTimeout(function() {
this.translateX = 0
}.bind(this), 1000)
// 背景淡淡消失 1s
setTimeout(function() {
this.isReady = true; // 撒礼花特效
var animationDelLots = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animationDelLots.opacity(0).step()
this.setData({
translateXState: animationDelLots.export()
})
let animation = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animation.opacity(1).step()
this.setData({
translateHide: animation.export()
})
}.bind(this), 2000)
//手机顶部盒子离开视线 2s
setTimeout(function() {
let animationDelLots = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animationDelLots.translate(-((this.data.windowWidth - this.data.editorWidth) /
2 + this.data.editorWidth) * 2, 0).step(); //向左移动
this.setData({
translateLeft: animationDelLots.export()
})
}.bind(this), 3000)
//显示功能按钮
setTimeout(function() {
this.isReady = false; // 消失礼花
let animation = wx.createAnimation({
duration: 1000,
timingFunction: 'ease-out'
})
animation.opacity(1).step()
this.setData({
functionHide: animation.export()
})
}.bind(this), 4000) */
} else { } else {
setTimeout(function() { setTimeout(function() {
...@@ -4521,11 +4339,6 @@ ...@@ -4521,11 +4339,6 @@
.surface_color_series_id //色系编号 .surface_color_series_id //色系编号
}).then(result => { }).then(result => {
this.Material_category = result this.Material_category = result
// this.Material_category.unshift({
// icon: "../../static/image/icon_new_default.png",
// icon_click: "../../static/image/icon_new_pressed.png",
// title: "最新"
// }, )
this.Adlists = this.diy_bannerList this.Adlists = this.diy_bannerList
this.queryPage.goods_id = this.data.goods_id this.queryPage.goods_id = this.data.goods_id
this.brands = this.Material_category this.brands = this.Material_category
...@@ -4713,7 +4526,6 @@ ...@@ -4713,7 +4526,6 @@
}); });
}); });
}, },
getDetail() { getDetail() {
uni.showLoading({ uni.showLoading({
...@@ -4737,16 +4549,6 @@ ...@@ -4737,16 +4549,6 @@
onLoad(options) { onLoad(options) {
this.options = options this.options = options
/* if(!this.options){
var url = Env.getBaseURL();
if (url.indexOf("refinecolor") != -1) {
this.options.machine_id = 100022;
this.options.goods_id = 301;
this.options.key = 3;
this.options.sn = 1703559495379168;
this.options.dict_id = 1372;
}
} */
let app = uni.getSystemInfoSync(); let app = uni.getSystemInfoSync();
//胶囊信息 //胶囊信息
let menuButtonInfo = uni.getMenuButtonBoundingClientRect(); let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
...@@ -4762,22 +4564,21 @@ ...@@ -4762,22 +4564,21 @@
this.infoListTouchEvent = infoListTouchEvent; this.infoListTouchEvent = infoListTouchEvent;
this.infoListTouchEvent.bind({ this.infoListTouchEvent.bind({
doubleTap: function(e) { //是双击事件 doubleTap: function(e) { //是双击事件
//this.isShowGif = false; // if (items[index].type == 0) {
if (items[index].type == 0) { // that.state = true
that.state = true // that.$refs.index.init();
that.$refs.index.init(); // }
}
}, },
tap: function(e) { tap: function(e) {
if (items == null || items.length == 0) { if (items == null || items.length == 0) {
that.active = false; that.active = false;
that.guide_left = false that.guide_left = false
} else { } else {
//that.isShowGif = false;
that.isShowMoveMaterial = false; that.isShowMoveMaterial = false;
that.drag_text_context = "单指可拖拽"; that.drag_text_context = "单指可拖拽";
that.cutting_text_context = "双指可伸缩"; that.cutting_text_context = "双指可伸缩";
var curTime = e.timeStamp that.itemClick(e)
/*var curTime = e.timeStamp
var lastTime = e.currentTarget.dataset.time //通过e.currentTarget.dataset.time 访问到绑定到该组件的自定义数据 var lastTime = e.currentTarget.dataset.time //通过e.currentTarget.dataset.time 访问到绑定到该组件的自定义数据
if (curTime - lastTime > 0) { if (curTime - lastTime > 0) {
if (curTime - lastTime < 300) { //是双击事件 if (curTime - lastTime < 300) { //是双击事件
...@@ -4788,8 +4589,8 @@ ...@@ -4788,8 +4589,8 @@
} else { } else {
that.itemClick(e); that.itemClick(e);
} }
} } */
that.lastTapTime = curTime //that.lastTapTime = curTime
} }
}, },
touchStart: function(e) { //拖拽开始 touchStart: function(e) { //拖拽开始
...@@ -5560,12 +5361,12 @@ ...@@ -5560,12 +5361,12 @@
} }
} }
// 底部工具栏 //底部工具栏
.toolRight { .toolRight {
position: fixed; position: fixed;
top: 440upx; top: 440upx;
right: 0; right: 0;
width: 100upx; width: 120upx;
.tool_li { .tool_li {
width: 100%; width: 100%;
......
pages/index/nick-name.vue
...@@ -4,23 +4,29 @@ ...@@ -4,23 +4,29 @@
<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>
</view> </view>
</template> </template>
<script> <script>
import Env from '@/util/Env.js'; import Env from '@/util/Env.js';
export default { export default {
data() { data() {
...@@ -29,27 +35,27 @@ ...@@ -29,27 +35,27 @@
nickName: '' nickName: ''
}; };
}, },
onLoad(option) { onLoad(option) {
}, },
methods: { methods: {
bindblur(e) { bindblur(e) {
console.log('nickName', e) console.log('nickName', e)
this.nickName = e.detail.value; this.nickName = e.detail.value;
}, },
bindinput(e) { bindinput(e) {
console.log('nickName', e) console.log('nickName', e)
this.nickName = e.detail.value; this.nickName = e.detail.value;
}, },
onChooseavatar(e) { onChooseavatar(e) {
this.avatarUrl = e.detail.avatarUrl; this.avatarUrl = e.detail.avatarUrl;
}, },
onSubmit() { onSubmit() {
if (this.nickName === '') { if (this.nickName === '') {
uni.showToast({ uni.showToast({
...@@ -61,22 +67,10 @@ ...@@ -61,22 +67,10 @@
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) {
// },
// });
}
},
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
...@@ -114,32 +108,47 @@ ...@@ -114,32 +108,47 @@
border: none; border: none;
} }
.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;
} }
} }
} }
</style> </style>
\ No newline at end of file
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>
...@@ -150,8 +158,7 @@ ...@@ -150,8 +158,7 @@
</view> </view>
</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({
...@@ -782,10 +780,10 @@ ...@@ -782,10 +780,10 @@
var that = this; var that = this;
wx.getSystemInfo({ wx.getSystemInfo({
success: function(res) { success: function(res) {
let pixelRate = res.windowWidth / 750; let pixelRate = res.windowWidth / 750;
that.data.windowWidth = res.windowWidth // 屏幕宽度 that.data.windowWidth = res.windowWidth // 屏幕宽度
that.data.windowHeight = res.windowHeight // 屏幕高度 that.data.windowHeight = res.windowHeight // 屏幕高度
that.data.pixelRate = pixelRate that.data.pixelRate = pixelRate
} }
}) })
}, },
...@@ -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