Commit 6584094d by huahua

修改样式

parent dffdd6f2
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
} }
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "#ffffff", "navigationBarTextStyle": "#61D119",
"navigationBarTitleText": "定制", "navigationBarTitleText": "定制",
"navigationBarBackgroundColor": "#141319", "navigationBarBackgroundColor": "#141319",
"backgroundColor": "#141319" "backgroundColor": "#141319"
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
"path": "lineUp", "path": "lineUp",
"style": { "style": {
"navigationBarTitleText": "排队信息", "navigationBarTitleText": "排队信息",
"enablePullDownRefresh": true "enablePullDownRefresh": true,
"navigationStyle": "custom"
} }
}, },
{ {
...@@ -80,7 +81,8 @@ ...@@ -80,7 +81,8 @@
"pages": [{ "pages": [{
"path": "order", "path": "order",
"style": { "style": {
"navigationBarTitleText": "付款区" "navigationBarTitleText": "付款区",
"navigationStyle": "custom" //禁用uni-app默认的头部导航
} }
}, },
{ {
......
<template> <template>
<uni-popup ref="Signincenter" type="bottom"> <uni-popup ref="Signincenter" type="bottom" >
<view class='dialog-container'> <view class='dialog-container' >
<!-- 遮罩 --> <!-- 遮罩 -->
<view <view style="position: fixed; top: 0; left: 0; width: 100%; height: 100%; opacity: 0.5; z-index: 998; background: #131319;"></view>
style="position: fixed; top: 0; left: 0; width: 100%; height: 100%; opacity: 0.5; z-index: 998; background: #131319;"> <view style="width: 100%; height: 1100upx; background: #fff; overflow: hidden; position: relative; z-index: 999; ">
</view>
<view
style="width: 100%; height: 1100upx; background: #eeeeee; overflow: hidden; position: relative; z-index: 999; ">
<view @click="cose()" style="position: absolute; top: 0; right: 0;"> <view @click="cose()" style="position: absolute; top: 0; right: 0;">
<image style="height: 30upx; width: 30upx; margin: 20upx;" src="../../static/icon_guanbi.png" <image style="height: 30upx; width: 30upx; margin: 20upx;" src="../../static/icon_guanbi.png" mode=""></image>
mode=""></image>
</view> </view>
<image src="../../static/logo.jpg" mode="aspectFill" <image src="../../static/logo.png" mode="aspectFill"
style="width: 109upx; height: 98upx; display: block; margin: 36upx auto 25upx;"></image> style="width: 109upx; height: 98upx; display: block; margin: 60upx auto 25upx;"></image>
<view style=" text-align: center; font-size: 32upx; font-weight: 500; color: #131319;"> <view style=" text-align: center; font-size: 32upx; font-weight: 500; color: #131319;">
欢迎来到{{startText}}小程序 </view> 欢迎来到{{startText}}小程序 </view>
<view <view style=" margin-top: 10upx; text-align: center; font-size: 24upx; font-weight: 500; color: #888888;">
style=" margin-top: 10upx; text-align: center; font-size: 24upx; font-weight: 500; color: #888888;">
为了更好的服务,需要得到您的授权 </view> 为了更好的服务,需要得到您的授权 </view>
<view class="avatarUrl" style="background: #fff;">
<view class="avatarUrl">
<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> </view>
<view class="nickname"> <view class="nickname" style="background: #fff;">
<text>昵称:</text> <text>昵称:</text>
<input type="nickname" class="weui-input" :value="nickName" @blur="bindblur" placeholder="请输入昵称" <input type="nickname" class="weui-input" :value="nickName" @blur="bindblur" placeholder="请输入昵称"
@input="bindinput" /> @input="bindinput"/>
</view> </view>
<view class="btn"> <view class="btn">
...@@ -184,6 +178,7 @@ ...@@ -184,6 +178,7 @@
}).then(result => { }).then(result => {
uni.setStorageSync('token', result.token) uni.setStorageSync('token', result.token)
uni.setStorageSync('uid', result.id)
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: '登录成功', title: '登录成功',
...@@ -261,6 +256,8 @@ ...@@ -261,6 +256,8 @@
machine_id: that.$base machine_id: that.$base
.machine_id, //用户进入设备id .machine_id, //用户进入设备id
}).then(result => { }).then(result => {
uni.setStorageSync('token', result.token)
uni.setStorageSync('uid', result.id)
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: '登录成功', title: '登录成功',
...@@ -376,11 +373,11 @@ ...@@ -376,11 +373,11 @@
} }
.avatarUrl { .avatarUrl {
padding: 80upx 0 40upx; padding: 70upx 0 40upx;
background: #EEE; background: #fff;
button { button {
background: #EEE; background: #fff;
line-height: 80upx; line-height: 80upx;
height: auto; height: auto;
width: auto; width: auto;
......
<template>
<!-- 贴图 -->
<view class="content" style="width: 100%; height: 100%; position: relative;overflow: hidden;">
<!-- <scroll-view scroll-y
style="height:100%;width: 100%; overflow: hidden; overflow-y: scroll; position: relative;"> -->
<template slot="content" style="margin-top: 140upx;">
<scroll-view scroll-y style="width:100%; margin: auto; height:1150upx; overflow: hidden; ">
<view style="float: left; width: calc(100% / 3); margin: 10upx 0 10upx; "
v-for="(item, index) in datalist" :key="index" @click="modeDetail(item)">
<view style="width: 139upx; height: 255upx; margin: auto; position: relative;">
<view style="display: flex;flex-direction: column;">
<image
style="width: 139upx; height: 200upx; 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: 5upx; text-align: center; font-size: 22upx; color: #FFFFFF;">{{item.name}}</view>
</view>
</view>
</view>
<view class="align-center"
style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);"
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>
</view>
</scroll-view>
</template>
<!-- <> -->
</view>
</template>
<script>
import homeservice from '@/service/homeservice.js';
import refresh from '@/components/xing-refresh/xing-refresh.vue';
export default {
props: {
windowHeight: {
type: Number,
default: 563
}
},
components: {
refresh
},
data() {
return {
queryCollectionPage: {
},
Material_categorydatalist: [], //作品、贴图列表
datalist: [], //作品、贴图列表
Material_category: [], //贴图分类
currentId: -1,
/* 控制被选中 */
currentIndex: null,
/* 控制位置 */
tip: '',
showState: false,
type: 0, //默认 0
item: null,
scrollViewTop: 0, //滚动距离
oldScrollViewTop: 0, //旧数据到顶部位置
e: 0, //弹窗类型
backColorVal:"",
catrgoryList:[], //品牌数据
machine_id:"" ,//设备Id
brandsitem:{},
goods_id_e:{},
modeltext: "",
goods_id: "",
dict_id: ""
};
},
mounted() {
},
/**
* 组件的公有方法列表
*/
methods: {
scroll(e) {
if (e.detail.scrollTop > 1) {
this.oldScrollViewTop = e.detail.scrollTop - 0.01
}
},
modeDetail(item) {
//item.isWork = this.isWork;
//this.$emit('Worksdetail', item)
this.brandsitem = item
homeservice.queryList({
s: 'Product.machineDetail', //新接口
machine_id: this.machine_id,
id: this.brandsitem.id //商品id
}).then(result => {
this.modeltext = this.brandsitem.name //机型名
this.goods_id = this.brandsitem.id //产品id
this.dict_id = result.dict_id //产品属性id
this.goods_id_e = {
brandtext: this.brandsitem.name, // 品牌名
modeltext: this.brandsitem.name, // 机型商品名
goods_id: this.brandsitem.id, // 产品id
dict_id: result.dict_id, // 产品属性
}
this.$emit('goodsbrands', {
goods_id_e: this.goods_id_e,
})
//this.$refs['shellShow'].close() //关闭手机壳子弹框
}).catch(err => {
// uni.showToast({
// title: err.msg,
// icon: 'none'
// });
});
},
open(item) {
this.machine_id = item.machine_id
homeservice.queryList({
s: 'Product.getBrandProducts', //新接口
goods_brand_id: item.id, //品牌id
machine_id: item.machine_id,
key: "3"
}).then(result => {
this.datalist = result // 品牌机型
console.log(this.datalist)
}).catch(err => {
uni.showToast({
title: err.msg,
icon: 'none'
});
});
},
}
}
</script>
<style lang="scss">
</style>
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
<view style="width: 100% ;background: #292933;"> <view style="width: 100% ;background: #292933;">
<!-- 字体 --> <!-- 字体 -->
<view v-if="show && text != 'typeface'" style="display: flex;align-items: center; justify-items: center; border-bottom: 2upx solid #000000; <view v-if="show && text != 'typeface'" style="display: flex;align-items: center; justify-items: center; border-bottom: 2upx solid #000000;height: 98upx; ">
height: 98upx; ">
<view <view
style="width: 601upx; height: 57upx; background: rgb(255,255,255,0.1); margin: 21upx 41upx 21upx 21upx; border-radius: 10upx;"> style="width: 601upx; height: 57upx; background: rgb(255,255,255,0.1); margin: 21upx 41upx 21upx 21upx; border-radius: 10upx;">
<input :fixed="true" :auto-height="true" :show-confirm-bar="false" :cursor-spacing="73" <input :fixed="true" :auto-height="true" :show-confirm-bar="false" :cursor-spacing="73"
...@@ -45,13 +44,13 @@ ...@@ -45,13 +44,13 @@
<!-- 色彩公园 {{item.title}} color: item.textlong == true ? '#ffffff' : '#BEBEBE'--> <!-- 色彩公园 {{item.title}} color: item.textlong == true ? '#ffffff' : '#BEBEBE'-->
<text style="font-size: 20upx;"> <text style="font-size: 20upx;">
<text style="font-size: 32upx;" <text style="font-size: 32upx;"
:style="{'color': data.itemList[data.cidx].font_dict_id == item.id ? '#F56364 !important' : '#ffffff'}"> :style="{'color': data.itemList[data.cidx].font_dict_id == item.id ? '#64DC17 !important' : '#ffffff'}">
色彩公园 壳小站
</text> </text>
<text v-if="item.remark != ''"> <text v-if="item.remark != ''">
{{item.long == true ? '' : '(点击加载)'}} {{item.long == true ? '' : '(点击加载)'}}
</text> </text>
<text v-if="item.remark != ''" style="color: #F56364;"> <text v-if="item.remark != ''" style="color: #64DC17;">
{{item.textlong == false ? '(下载失败,点击重新下载)' : ''}} {{item.textlong == false ? '(下载失败,点击重新下载)' : ''}}
</text> </text>
</text> </text>
...@@ -69,10 +68,10 @@ ...@@ -69,10 +68,10 @@
v-for="(item,index) in colorList" :key="index" @click.stop="workcolor(item.color)"> v-for="(item,index) in colorList" :key="index" @click.stop="workcolor(item.color)">
<view v-if="data.itemList[data.cidx]"> <view v-if="data.itemList[data.cidx]">
<view v-if="data.itemList[data.cidx].font_color == item.color && !bg_text_color" <view v-if="data.itemList[data.cidx].font_color == item.color && !bg_text_color"
style="width: 68upx; height: 68upx; background: #000000; border: 4upx solid #854AC2; border-radius: 50%;" style="width: 68upx; height: 68upx; background: #000000; border: 4upx solid #64DC17; border-radius: 50%;"
:style="{background:item.color}"></view> :style="{background:item.color}"></view>
<view v-else-if="data.itemList[data.cidx].under_color == item.color && bg_text_color" <view v-else-if="data.itemList[data.cidx].under_color == item.color && bg_text_color"
style="width: 68upx; height: 68upx; background: #000000; border: 4upx solid #854AC2; border-radius: 50%;" style="width: 68upx; height: 68upx; background: #000000; border: 4upx solid #64DC17; border-radius: 50%;"
:style="{background:item.color}"></view> :style="{background:item.color}"></view>
<view v-else <view v-else
style="width: 68upx; height: 68upx; background: #000000; border: 4upx solid #ffffff; border-radius: 50%;" style="width: 68upx; height: 68upx; background: #000000; border: 4upx solid #ffffff; border-radius: 50%;"
...@@ -144,12 +143,12 @@ ...@@ -144,12 +143,12 @@
<scroll-view style="width: calc(100% - 40upx); margin: auto; height:300upx; overflow: hidden;" <scroll-view style="width: calc(100% - 40upx); margin: auto; height:300upx; overflow: hidden;"
scroll-y scroll-with-animation> scroll-y scroll-with-animation>
<view v-for="(item, index) in textlist" <view v-for="(item, index) in textlist"
:style="{'font-family': item.fontname,'color': data.itemList[data.cidx].font_family == item.fontname ? '#F56364' : 'none'}" :style="{'font-family': item.fontname,'color': data.itemList[data.cidx].font_family == item.fontname ? '#64DC17' : 'none'}"
@click="typefaceClick(item,index)" :key="index" @click="typefaceClick(item,index)" :key="index"
style="font-size: 40upx; color: #FFFFFF; margin: 10upx;"> style="font-size: 40upx; color: #FFFFFF; margin: 10upx;">
{{item.text}} {{item.text}}
<text <text
style="font-size: 20upx; color: #F56364;">{{item.textlong ? '' : '(该字体加载失败)'}}</text> style="font-size: 20upx; color: #64DC17;">{{item.textlong ? '' : '(该字体加载失败)'}}</text>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<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" <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> 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: 23upx; 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>
<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 + 'px', color:color, 'font-size': size + 'rpx' }">{{title}}</view>
</view> </view>
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<!-- 自定义头部 --> <!-- 自定义头部 -->
<view class='flex commonHead' :style="{height: titleHeight +'px'}"> <view class='flex commonHead' :style="{height: titleHeight +'px'}">
<view class='commonHead-wrap flex'> <view class='commonHead-wrap flex'>
<view class='commonHead_left' @click="tomine()"> <!-- <view class='commonHead_left' @click="tomine()">
<view class='commonHead_left_back'> <view class='commonHead_left_back'>
<view class="commonHead_left_back_img"> <view class="commonHead_left_back_img">
<image :src="portraitUrl" style="width: 50upx; height: 50upx; border-radius: 30upx; margin-top: 10upx; background: #FFFFFF;" mode="aspectFill"></image> <image :src="portraitUrl" style="width: 50upx; height: 50upx; border-radius: 30upx; margin-top: 10upx; background: #FFFFFF;" mode="aspectFill"></image>
</view> </view>
</view> </view>
</view> </view> -->
<view class='commonHead_right flex'> <view class='commonHead_right flex'>
<view class='commonHead_right_text line1'>手机壳定制站</view> <view class='commonHead_right_text line1'>手机壳定制站</view>
</view> </view>
...@@ -48,7 +48,15 @@ ...@@ -48,7 +48,15 @@
<view v-if="LoupanList.length > 0"> <view v-if="LoupanList.length > 0">
<view style="margin-top: 29upx;"> <view style="margin-top: 29upx;">
<view v-if="system_config.phone_diy.value == 0" @tap="doubleTap" @touchstart="touchStart" <view v-if="system_config.phone_diy.value == 0" @tap="doubleTap" @touchstart="touchStart"
@touchend="touchEnd"style="position: fixed; z-index: 99; right: 0; bottom: 524upx; display: flex;align-items: center;justify-content: center; width: 100upx; height: 88upx; background: linear-gradient(92deg, #178CE6, #984ACE); border-radius: 44upx 0px 0px 44upx;"> @touchend="touchEnd"style="position: fixed; z-index: 99;
right: 0;
bottom: 524upx;
display: flex;
align-items: center;
justify-content: center;
width: 100upx; height: 88upx;
background: linear-gradient(92deg, #64DD17, #64DD17);
border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;"> <view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>定制</view> <view>定制</view>
<view>体验</view> <view>体验</view>
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<view class="full-width full-height"> <view class="full-width full-height">
<view style="min-height: 100%;"> <view style="min-height: 100%;">
<view class="start"> <view class="start">
<image src="../../static/logo.jpg" mode="aspectFill" class="start_img"></image> <image src="../../static/logo.png" mode="aspectFill" class="start_img"></image>
<view class="start_title">ColorPark</view> <view class="start_title">壳小站</view>
<view class="start_text">{{startText}}</view> <view class="start_text">{{startText}}</view>
<view class="longTitle"> <view class="longTitle">
<view>ColorPark,把爱穿在身上、棒在手心</view> <!-- <view>壳小站,把爱穿在身上、棒在手心</view> -->
你的第一份爱的定制在这里开始 你的第一份爱的定制在这里开始
</view> </view>
<view class="footer_but"> <view class="footer_but">
...@@ -74,8 +74,8 @@ ...@@ -74,8 +74,8 @@
lang:'zh_CN', lang:'zh_CN',
desc: '用于完善会员资料', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写 desc: '用于完善会员资料', // 声明获取用户个人信息后的用途,后续会展示在弹窗中,请谨慎填写
success: (Userres) => { success: (Userres) => {
console.log('getUserInfo 获取头像昵称') //console.log('getUserInfo 获取头像昵称')
console.log(Userres) //console.log(Userres)
that.$base.Userres = Userres that.$base.Userres = Userres
uni.showLoading({title: '正在登录中...',mask: true}); uni.showLoading({title: '正在登录中...',mask: true});
uni.login({ uni.login({
......
<template> <template>
<view class="full-width full-height"> <view class="full-width full-height">
<!-- 礼花 -->
<firework ref="firework" v-if="isReady" style="position: fixed;z-index: 9999;"></firework> <myhead :worksid="'0'" :title="'付款区'" :color="'#61D119'" :titleShow="true" :backShow="true" :background="'#131319'"></myhead>
<scroll-view scroll-y <scroll-view scroll-y
style="height:100%;width: 100%; overflow: hidden; overflow-y: scroll; position: relative;"> style="height:100%;width: 100%; overflow: hidden; overflow-y: scroll; position: relative;">
<view :style="{transform: 'translateX(' + translateX + 'px)'}"
style="position: absolute;transition: all 1.5s; height:100%;width: 100%;">
<!-- 设计区底图 -->
<view style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;overflow: hidden;">
<image src="https://img.colorpark.cn/wechat/track/shejiqu_2.png" mode="widthFix"
style="width: 100%;"></image>
</view>
<!-- 付款区底图 -->
<view style="position: absolute; top: 0; left: 100%; width: 100%; height: 100%;overflow: hidden;">
<image src="https://img.colorpark.cn/wechat/track/fukuanqu_2.png" mode="widthFix"
style="width: 100%;"></image>
</view>
</view>
<!-- 3D动画 -->
<view class='crate-wrapper' @touchstart.stop="dragStart" @touchmove.stop="dragMove" <view class='crate-wrapper' @touchstart.stop="dragStart" @touchmove.stop="dragMove"
@touchend.stop="dragEnd"> @touchend.stop="dragEnd">
<view class="brush" <view class="brush">
:style="{transform: 'translateX(' + activebrushX + 'px) scale(' + transformscale + ')'}"> <view class='crate' :style="{width: data.editorWidth +'px',height: data.editorHeight +'px'}" >
<view class='crate' :class="{crateactive:crateactivestate}" :style="{width: data.editorWidth +'px',height: data.editorHeight +'px',
transform: 'rotateX(-15deg) rotateY(' + coordinate.numberY +'deg)'}">
<!-- <view class='side top'>
<image src="../../static/img/c.png" mode=""
style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;"></image>
</view> -->
<!-- <view class='side bottom' :style="{'-webkit-transform': 'translateY(' + (data.editorHeight - 20) + 'px) rotateX(90deg)',
transform: 'translateY(' + (data.editorHeight - 20) + 'px) rotateX(90deg)'}">
<image src="../../static/img/c.png" mode=""
style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;"></image>
</view>
<view class='side left'>
<image src="../../static/img/b.png" mode=""
style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;"></image>
</view>
<view class='side right' :style="{'-webkit-transform': 'translateX(' + (data.editorWidth - 20) + 'px) rotateY(90deg)',
transform: 'translateX(' + (data.editorWidth - 20) + 'px) rotateY(90deg)'}">
<image src="../../static/img/b.png" mode=""
style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;"></image>
</view> -->
<view class='side front' style="background: #FFF;"> <view class='side front' style="background: #FFF;">
<view style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;background: #fff;"></view> <view style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;background: #fff;"></view>
<image :src="( good.icon ? good.icon : good.image )" mode="aspectFit" <image :src="( good.icon ? good.icon : good.image )" mode="aspectFit"
...@@ -49,12 +16,8 @@ ...@@ -49,12 +16,8 @@
<image :src="good.goods.front_image " mode="aspectFit" <image :src="good.goods.front_image " mode="aspectFit"
style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;"></image> style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;"></image>
</view> </view>
<!-- <view class='side back'>
<image src="../../static/img/a.png" mode=""
style="position: absolute; width: 100%; height: 100%; left: 0; top: 0;"></image>
</view> -->
</view> </view>
<view style="margin-top: 50upx; text-align: center;" :style="{opacity:titlestate ? 1:0}"> <view style="margin-top: 30upx; text-align: center;" >
<view style="font-size: 40upx; font-weight: bold;"> <view style="font-size: 40upx; font-weight: bold;">
<text style="color: #FFFFFF;">{{good.goods.name || '**'}}</text> <text style="color: #FFFFFF;">{{good.goods.name || '**'}}</text>
</view> </view>
...@@ -80,10 +43,13 @@ ...@@ -80,10 +43,13 @@
import Enums from '@/util/Enums'; import Enums from '@/util/Enums';
import md5 from 'js-md5'; import md5 from 'js-md5';
import firework from '@/components/ay-firework/firework.vue'; //礼花 import firework from '@/components/ay-firework/firework.vue'; //礼花
import myhead from '../index/head/head.vue'; // 页眉
export default { export default {
components: { components: {
uniPopup, uniPopup,
firework firework,
myhead
}, },
computed: { computed: {
add(arg1, arg2) { add(arg1, arg2) {
...@@ -165,21 +131,10 @@ ...@@ -165,21 +131,10 @@
}, },
methods: { methods: {
dragStart(e) { dragStart(e) {
/*if(!this.coordinate.state) return; // 记录点击时的坐标值
this.coordinate.startX = e.touches[0].clientX;
this.coordinate.startY = e.touches[0].clientY; */
}, },
dragMove(e) { dragMove(e) {
/*if(!this.coordinate.state) return;
this.coordinate.touchMoveX = e.touches[0].clientX;
this.coordinate.touchMoveY = e.touches[0].clientY;
if (this.coordinate.touchMoveX > this.coordinate.startX) {
this.coordinate.numberY += this.coordinate.touchMoveX - this.coordinate.startX
} else {
this.coordinate.numberY -= this.coordinate.startX - this.coordinate.touchMoveX
}
this.coordinate.startX = e.touches[0].clientX;
this.coordinate.startY = e.touches[0].clientY; */
}, },
//拖动结束事件 //拖动结束事件
dragEnd(e) { dragEnd(e) {
...@@ -391,14 +346,20 @@ ...@@ -391,14 +346,20 @@
}); });
let type = this.tabletext ? 3 : 1 //1:配送版,2:单机版,3:自助版 let type = this.tabletext ? 3 : 1 //1:配送版,2:单机版,3:自助版
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.navigateTo({
url: '../mall/lineUp?machine_id=' + seft.machine_id + '&key=' +
seft.key
})
/* uni.navigateTo({
url: './self_help_payment_details?orderId=' + order_id + url: './self_help_payment_details?orderId=' + order_id +
'&type=' + type + '&machine_id=' + seft.machine_id '&type=' + type + '&machine_id=' + seft.machine_id
}) }) */
}, 3000) }, 1000)
setTimeout(() => { setTimeout(() => {
seft.loading = false; seft.loading = false;
}, 10000) }, 5000)
}, },
fail: (err = {}) => { fail: (err = {}) => {
console.log('fail00:' + JSON.stringify(err || '')); console.log('fail00:' + JSON.stringify(err || ''));
...@@ -423,8 +384,6 @@ ...@@ -423,8 +384,6 @@
}).then(result => { }).then(result => {
this.coupon = result.coupon this.coupon = result.coupon
this.stock = result.stock this.stock = result.stock
// machine_id=100012&goods_id=33&goodid=8628&sn=1617263541425371
// 读出锁库存储存信息
this.sizetext_id = this.$base.lockInventory.id this.sizetext_id = this.$base.lockInventory.id
this.sizetext = this.$base.lockInventory.goods_size this.sizetext = this.$base.lockInventory.goods_size
this.sizestock = this.$base.lockInventory.stock this.sizestock = this.$base.lockInventory.stock
...@@ -443,12 +402,7 @@ ...@@ -443,12 +402,7 @@
this.machine_item = this.machineDetail this.machine_item = this.machineDetail
this.machine_item.machine_category_text = this.machineDetail.category.title this.machine_item.machine_category_text = this.machineDetail.category.title
this.key = this.machineDetail.category.key this.key = this.machineDetail.category.key
// this.machine_item.category.forEach(item => {
// if (item.id == this.machine_item.machine_category_id) {
// this.machine_item.machine_category_text = item.title
// this.key = item.key
// }
// })
this.getMachineStock() this.getMachineStock()
// homeservice.WorksList({ // homeservice.WorksList({
// s: 'machine.detail', // s: 'machine.detail',
...@@ -484,8 +438,12 @@ ...@@ -484,8 +438,12 @@
this.data.printingStartX = -((this.data.windowWidth - this.data.editorWidth) / 2 + this.data.editorWidth) this.data.printingStartX = -((this.data.windowWidth - this.data.editorWidth) / 2 + this.data.editorWidth)
this.activebrushX = -((this.data.windowWidth - this.data.editorWidth) / 2 + this.data.editorWidth) this.activebrushX = -((this.data.windowWidth - this.data.editorWidth) / 2 + this.data.editorWidth)
this.$base.mobilePhoneCaseSize = this.data this.$base.mobilePhoneCaseSize = this.data
this.translateX = -this.data.windowWidth
this.activebrushX = 0
this.coordinate.state = true
this.titlestate = true
//背景图移动 1.5s //背景图移动 1.5s
setTimeout(function() { /* setTimeout(function() {
this.translateX = -this.data.windowWidth this.translateX = -this.data.windowWidth
}.bind(this), 1000) }.bind(this), 1000)
//手机壳进去页面 1.5s //手机壳进去页面 1.5s
...@@ -496,7 +454,7 @@ ...@@ -496,7 +454,7 @@
//this.titlestate = true //this.titlestate = true
setTimeout(function() { setTimeout(function() {
this.titlestate = true this.titlestate = true
}.bind(this), 3500) }.bind(this), 3500) */
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
...@@ -587,7 +545,7 @@ ...@@ -587,7 +545,7 @@
.brush { .brush {
transition: all 1.5s; transition: all 1.5s;
transform: translateX(-400px); transform: translateX(0px);
} }
.crate .side { .crate .side {
......
<template> <template>
<view class="full-width full-height" :style="{overflow: isReady ? 'hidden' : 'scroll' }"> <view class="full-width full-height" :style="{overflow: isReady ? 'hidden' : 'scroll' }">
<!-- 音乐 --> <!-- 音乐 -->
<!-- https://img.colorpark.cn/wechat/stitch.m4a -->
<!-- https://img.colorpark.cn/wechat/ring.m4a -->
<!-- https://img.colorpark.cn/wechat/ring2.m4a -->
<audio src="https://img.colorpark.cn/wechat/stitch.m4a" :action="stitchaction" controls loop <audio src="https://img.colorpark.cn/wechat/stitch.m4a" :action="stitchaction" controls loop
style="opacity: 0; position: absolute;"></audio> style="opacity: 0; position: absolute;"></audio>
<audio src="https://img.colorpark.cn/wechat/ring2.m4a" :action="ringaction" controls loop <audio src="https://img.colorpark.cn/wechat/ring2.m4a" :action="ringaction" controls loop
...@@ -40,10 +37,11 @@ ...@@ -40,10 +37,11 @@
<view style="display: flex;position: relative;"> <view style="display: flex;position: relative;">
<view style="position: relative;transition: all 3s; z-index: 2;" :style="{width: data.editorWidth +'px',height: data.editorHeight +'px', <view style="position: relative;transition: all 3s; z-index: 2;" :style="{width: data.editorWidth +'px',height: data.editorHeight +'px',
transform: 'translateX(' + data.activebrushX + 'px)'}"> transform: 'translateX(' + data.activebrushX + 'px)'}">
<image :src="goods.goods.surface_pic + '?x-oss-process=image/resize,lfit,w_1000'" <view style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; background: #fff; z-index: 1;"></view>
<!-- <image :src="goods.goods.surface_pic + '?x-oss-process=image/resize,lfit,w_1000'"
mode="" mode=""
style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 1;"> style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 1;">
</image> </image> -->
<!-- <view style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; background: #fff; z-index: 1;"></view> --> <!-- <view style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; background: #fff; z-index: 1;"></view> -->
<image :src="goods.works_image" mode="" <image :src="goods.works_image" mode=""
style="position: absolute; width: 100%; height: 100%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 2;"> style="position: absolute; width: 100%; height: 100%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 2;">
...@@ -96,10 +94,10 @@ ...@@ -96,10 +94,10 @@
<!-- 底图 --> <!-- 底图 -->
<view style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; <view style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0;
margin: auto; bottom: 0; background: #fff; z-index: 1;"></view> margin: auto; bottom: 0; background: #fff; z-index: 1;"></view>
<image :src="goods.goods.surface_pic + '?x-oss-process=image/resize,lfit,w_1000'" <!-- <image :src="goods.goods.surface_pic + '?x-oss-process=image/resize,lfit,w_1000'"
mode="" mode=""
style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 1;"> style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 1;">
</image> </image> -->
<!-- 作品图 --> <!-- 作品图 -->
<image v-if="initstate" :src="goods.works_image" mode="" <image v-if="initstate" :src="goods.works_image" mode=""
:style="{'z-index': data.render_cove_width ? 2:0}" :style="{'z-index': data.render_cove_width ? 2:0}"
...@@ -152,9 +150,9 @@ ...@@ -152,9 +150,9 @@
<view style="width: 95%; height: 95%; background: #FFFFFF; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index: 0;"> <view style="width: 95%; height: 95%; background: #FFFFFF; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index: 0;">
</view> </view>
<!-- 底图 --> <!-- 底图 -->
<image :src="goods.goods.surface_pic + '?x-oss-process=image/resize,lfit,w_1000'" mode="" <!-- <image :src="goods.goods.surface_pic + '?x-oss-process=image/resize,lfit,w_1000'" mode=""
style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 1;"> style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 1;">
</image> </image> -->
<!-- <view style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; background: #fff; z-index: 1;"></view> --> <!-- <view style="position: absolute; width: 98%; height: 98%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; background: #fff; z-index: 1;"></view> -->
<image :src="goods.works_image" mode="" style="position: absolute; width: 100%; <image :src="goods.works_image" mode="" style="position: absolute; width: 100%;
height: 100%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 2;"></image> height: 100%; left: 0; top: 0; right: 0; margin: auto; bottom: 0; z-index: 2;"></image>
...@@ -179,11 +177,8 @@ ...@@ -179,11 +177,8 @@
<view style="margin-top: 378upx; display: flex;align-items: center; justify-content: center;"> <view style="margin-top: 378upx; display: flex;align-items: center; justify-content: center;">
<view style="width: 187upx; position: relative; border-radius: 10upx;" <view style="width: 187upx; position: relative; border-radius: 10upx;"
@click="previewImg(goods,0)"> @click="previewImg(goods,0)">
<view <view style="width: 128upx; height: 236upx;margin:auto; display: block; position: relative; overflow: hidden;">
style="width: 128upx; height: 236upx;margin:auto; display: block; position: relative; overflow: hidden;"> <view style="width: 95%; height: 95%; background: #FFFFFF; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index: 0;"></view>
<view
style="width: 95%; height: 95%; background: #FFFFFF; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index: 0;">
</view>
<image <image
style="width: 100%; height: 100%; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index: 10;" style="width: 100%; height: 100%; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index: 10;"
:src="goods.goods.front_image" mode="aspectFit"></image> :src="goods.goods.front_image" mode="aspectFit"></image>
......
static/icon/icon_refresh.png

918 Bytes | W: | H:

static/icon/icon_refresh.png

1.07 KB | W: | H:

static/icon/icon_refresh.png
static/icon/icon_refresh.png
static/icon/icon_refresh.png
static/icon/icon_refresh.png
  • 2-up
  • Swipe
  • Onion skin
static/icon/icon_refresh_red.png

1.65 KB | W: | H:

static/icon/icon_refresh_red.png

5.37 KB | W: | H:

static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
  • 2-up
  • Swipe
  • Onion skin
static/icon/icon_stickers.png

876 Bytes | W: | H:

static/icon/icon_stickers.png

1.62 KB | W: | H:

static/icon/icon_stickers.png
static/icon/icon_stickers.png
static/icon/icon_stickers.png
static/icon/icon_stickers.png
  • 2-up
  • Swipe
  • Onion skin
static/icon/icon_typeface.png

555 Bytes | W: | H:

static/icon/icon_typeface.png

397 Bytes | W: | H:

static/icon/icon_typeface.png
static/icon/icon_typeface.png
static/icon/icon_typeface.png
static/icon/icon_typeface.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_confirm.png

1.11 KB | W: | H:

static/icon_confirm.png

1.26 KB | W: | H:

static/icon_confirm.png
static/icon_confirm.png
static/icon_confirm.png
static/icon_confirm.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_make_diy_back_color.png

1.14 KB | W: | H:

static/icon_make_diy_back_color.png

1.22 KB | W: | H:

static/icon_make_diy_back_color.png
static/icon_make_diy_back_color.png
static/icon_make_diy_back_color.png
static/icon_make_diy_back_color.png
  • 2-up
  • Swipe
  • Onion skin
static/recommend/icon_back.png

254 Bytes | W: | H:

static/recommend/icon_back.png

3.52 KB | W: | H:

static/recommend/icon_back.png
static/recommend/icon_back.png
static/recommend/icon_back.png
static/recommend/icon_back.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -2,14 +2,20 @@ const accountInfo = wx.getAccountInfoSync(); ...@@ -2,14 +2,20 @@ const accountInfo = wx.getAccountInfoSync();
if(!accountInfo.miniProgram.envVersion){ if(!accountInfo.miniProgram.envVersion){
//console.error("获取运行环境失败!"); //console.error("获取运行环境失败!");
} }
/* img.kexiaozhan.cn
render.kexiaozhan.cn
ws.kexiaozhan.cn
print.kexiaozhan.cn */
const baseApi = { const baseApi = {
//开发版 //开发版
develop: "https://kxz.refinecolor.com", //develop: "https://kxz.refinecolor.com",
//develop: "https://tprint.colorpark.cn", develop: "https://print.kexiaozhan.cn",
//体验版 //体验版
trial: "https://kxz.refinecolor.com", trial: "https://kxz.refinecolor.com",
//正式版 //正式版
release: "https://kxz.colorpark.cn", release: "https://print.kexiaozhan.cn",
}; };
const baseURL = baseApi[accountInfo.miniProgram.envVersion] const baseURL = baseApi[accountInfo.miniProgram.envVersion]
const Env = { const Env = {
......
...@@ -12,9 +12,9 @@ import CryptoJS from 'crypto-js'; ...@@ -12,9 +12,9 @@ import CryptoJS from 'crypto-js';
// callback:结果的回调 // callback:结果的回调
// type 1: 人物动漫化 2:人物素描化 // type 1: 人物动漫化 2:人物素描化
function callRecognizeBankCard(imageURL, miniProgramType, type, callback) { function callRecognizeBankCard(imageURL, miniProgramType, type, callback) {
const accessKeyId = "LTAI5tDPiEBZgfqNcWBqaFEc"; const accessKeyId = "LTAI5tQWJ47GrfDaiUw3f5yP";
//AccessKeySecret //AccessKeySecret
const accessKeySecret = "amI84BLFbHz6dhOVbuArrERmeemmnx"; const accessKeySecret = "bMFIqdYnDw3IBZgKw37Zr5IbDqZN8k";
//这里endpoint为API访问域名,与类目相关,具体类目的API访问域名请参考:https://help.aliyun.com/document_detail/143103.html //这里endpoint为API访问域名,与类目相关,具体类目的API访问域名请参考:https://help.aliyun.com/document_detail/143103.html
let endpoint = "facebody.cn-shanghai.aliyuncs.com"; let endpoint = "facebody.cn-shanghai.aliyuncs.com";
//API Action,能力名称,请参考具体算法文档详情页中的Action参数,这里以银行卡识别为例:https://help.aliyun.com/document_detail/151893.html //API Action,能力名称,请参考具体算法文档详情页中的Action参数,这里以银行卡识别为例:https://help.aliyun.com/document_detail/151893.html
......
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