Skip to content

K
kxz-app-phone
Commit ab898630 by huahua
Options

提交

parent d0824a3b
Showing with 425 additions and 266 deletions
pages/index/components/NumSlider.vue
......@@ -51,7 +51,6 @@
type: Number,
default: 8
},
},
data() {
return {
......@@ -76,12 +75,9 @@
this.$emit('lowChange', to) // 左滑块对应数字回调
},
high(to) {
// 右滑块对应数字回调
//右滑块对应数字回调
this.defalutFilletData = Math.floor((to / 10) * 1.5);
this.$emit('highChange', this.defalutFilletData)
//Math.floor((this.defalutFillet / 50) * to);
//console.log("to=" + to + "this.defalutFilletData=" + this.defalutFilletData
this.$emit('highChange', this.defalutFilletData)
}
},
......
pages/index/components/scrollModeView.vue
<template>
<!-- 贴图 -->
<view class="content" style="width: 100%; height: 100%; position: relative;overflow: hidden;">
<view class="content" style="width: calc(100% - 150upx); height: calc(100% - 180upx); position: relative;overflow: hidden;
border: 3upx solid #61D119; margin-top: 140upx; margin-right: 10upx; ">
<veiw>
<scroll-view scroll-y style="width:100%; margin: auto; height:calc(100% - 220upx); overflow: hidden; margin-top: 140upx; ">
<view style="float: left; width: calc(100% / 3); margin: 10upx 0 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; "
v-for="(item, index) in datalist" :key="index" @click="modeDetail(item)">
<view style="width: 139upx; height: 255upx; margin: auto; position: relative;">
<view style="width: 130upx; 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;"
style="width: 130upx; height: 180upx; 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: #61D119;">{{item.name}}</view>
<text style=" margin-top: 4upx; text-align: center; font-size: 22upx; color: #000; font-weight: 1000;">{{item.name}}</text>
</view>
</view>
</view>
......@@ -24,7 +25,7 @@
</view>
</view>
</scroll-view>
</veiw>
</veiw>
</view>
</template>
......@@ -86,8 +87,6 @@
},
modeDetail(item) {
//item.isWork = this.isWork;
//this.$emit('Worksdetail', item)
this.brandsitem = item
homeservice.queryList({
s: 'Product.machineDetail', //新接口
......@@ -106,7 +105,6 @@
this.$emit('goodsbrands', {
goods_id_e: this.goods_id_e,
})
//this.$refs['shellShow'].close() //关闭手机壳子弹框
}).catch(err => {
// uni.showToast({
// title: err.msg,
......
pages/index/components/switchBrands.vue
......@@ -1087,12 +1087,12 @@
.scroll-item {
width: 152upx;
height: 248upx;
background: #F5F5F5;
/* background: #F5F5F5; */
border-radius: 20upx;
text-align: center;
display: inline-block;
margin: 0 10upx;
border: 4upx solid #F5F5F5;
/* border: 4upx solid #F5F5F5; */
&.active {
background: #FFFFFF !important;
......
pages/index/index.vue
......@@ -318,56 +318,54 @@
<!-- 菜单栏目 -->
<view v-if="!active && !guide_left" class="toolRight" >
<view class="tool_li">
<view class="tool_li" @click="selectPicturePop()" >
<image @click="cancel('share')" class="tool_li_img"
src="../../static/icon_make_diy_back_color.png" mode="aspectFit"
style=" width: 64upx;height: 64upx;"></image>
<view @click="cancel('share')" class="tool_li_text">上传相片</view>
</view>
<view class="tool_li" @click="selectPicturePop()" style="margin-top: 22upx;">
<image class="tool_li_img" src="../../static/icon_make_diy_back_color.png"
style="width: 60upx;height: 60upx;" mode="aspectFit"></image>
<view class="tool_li_text">上传相片</view>
</view>
<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=""></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>
<view class="tool_li" @click="showPopup(2)">
<image class="tool_li_img" src="../../static/icon/icon_stickers.png" mode=""></image>
<view class="tool_li" @click="showPopup(2)">
<image class="tool_li_img" src="../../static/icon/icon_stickers.png" mode="aspectFit"></image>
<view class="tool_li_text">推荐图片</view>
</view>
</view>
</view>
<view class="tool_li" @click="showAiChange()">
<image @click="cancel('share')" class="tool_li_img"
src="../../static/icon_diy_ai.png" mode="aspectFit"
style=" width: 50upx;height: 50upx;"></image>
</view>
</view>
<tuya ref="tuya" @tuyaimg="tuyaimg"></tuya>
<!-- 编辑文字跟图片按钮 -->
<view v-if="active && !guide_left" style="position: fixed;bottom: 450upx;right: 30upx;">
<view v-if="active && !guide_left" style="position: fixed;top: 718upx;right: 26upx; z-index: 99999;">
<view style="width: 100%;height: 130upx;">
<!-- 点击画布区域取消聚焦 -->
<view style="width: 100%;height: 110upx;" @click.stop="itemCancel">
<image style="width: 51upx; height: 51upx;display: block; margin: auto;"
src="../../static/icon_confirm.png" mode=""></image>
<view style="width: 100%;height: 90upx;" @click.stop="itemCancel">
<image style="width: 50upx; height: 50upx;"
src="../../static/icon_confirm.png" mode="aspectFit"></image>
</view>
<!-- AI图像 -->
<view v-if="data.itemList.length > 0">
<view style="height: 120upx;width: 100%;" @click="showAiChange()"
v-if="data.itemList[data.cidx].type == 0 && data.itemList[data.cidx].isUpLoadImage">
<image class="tool_li_img" style="width: 50upx; height: 38upx;"
src="../../static/icon_diy_ai.png"></image>
<view v-if="data.itemList.length > 0">
<view style="height: 90upx;width: 100%;" @click="showAiChange()">
<image class="tool_li_img" style="width: 50upx; height: 50upx;"
src="../../static/icon_diy_ai.png" mode="aspectFit" ></image>
</view>
</view>
<!-- 编辑 -->
</view>
<view v-if="data.itemList.length > 0">
<view style="width: 100%;height: 110upx; margin-top: 15upx;"
v-if="data.itemList[data.cidx].type == 1" @click="showPopup(4)">
<image style="width: 54upx; height: 54upx;display: block;margin: auto;"
src="../../static/icon/diy_icon_editor_default.png" mode=""></image>
<view style="text-align: center;color: #FFFFFF;font-size: 22upx;margin-top: 10upx;">编辑文字
</view>
<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;"
src="../../static/icon/diy_icon_editor_default.png" mode="aspectFit" ></image>
</view>
</view>
</view>
</view>
</view>
......@@ -377,7 +375,7 @@
src="../../static/qiehuan.png" mode=""></image>
</view>
<view class="toolLeft" style="margin-left: 10upx;" @click.stop="removedeleteItem"
<view class="toolLeft" style="margin-left: 2upx; z-index: 999999;" @click.stop="removedeleteItem"
v-if="data.itemList.length > 0 && !guide_left">
<image style=" width: 50upx;
height: 50upx;
......@@ -386,7 +384,7 @@
<view style="text-align: center;
color: #F56364;
font-size: 20upx;
margin-top: 10upx;">移除图片</view>
margin-top: 8upx;">移除图片</view>
</view>
<view class="toolLeft" style="margin-left: 10upx; margin-top: 130upx"
......@@ -578,51 +576,79 @@
</view>
</uni-popup>
<!-- 手机品牌型号 -->
<uni-popup ref="showBrandShare" type="bottom"
style="position: relative; z-index: 9998; width: 100%;" :style="{height: data.windowHeight +'px'}">
<view class="uni-share full-width" :style="{height: data.windowHeight +'px'}">
<view style="position: absolute; bottom: 0; left: 0; height: 100%; width: 100%; z-index: 997; opacity: 0.8;" @click="cancelshowBrandShare()"/>
<view style="position: absolute;
bottom: 0upx;
left: 0;
height: 100%; width: 120upx;
z-index: 999; background: #1A1D33;
overflow: hidden;">
<view style="width: 120upx; height: 188upx;"></view>
<view style="width: 120upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
:style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}" scroll-y
scroll-with-animation v-if="brandList.length > 0" :scroll-into-view="'s' + currentIndex">
<view
:class="[index == currentIdBrand ? 'scroll-item-select' : 'scroll-item-no-select']" :id="'s' + index"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)">
<image
style="width: 60upx; height: 100upx; display: block;margin:auto; padding: 18upx;"
:src="item.icon" mode="aspectFit">
</image>
</view>
</scroll-view>
</view>
</view>
<view style="position: absolute;
bottom: 0upx;
left: 120upx;
height: 100%;
width: calc(100% - 200upx);
z-index: 999;
overflow: hidden;
background: #fff;">
<scrollModeView ref="scrollModeView"
@goodsbrands="goodsbrands"
:windowHeight="(data.windowHeight - 210 * data.pixelRate - classificationHeight)">
</scrollModeView>
</view>
</view>
</uni-popup>
<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'}">
<view class="uni-share full-width" :style="{height: data.windowHeight +'px'}" style="background: #fff;">
<view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 120upx;
z-index: 7;
overflow: hidden;">
<view style="width: 120upx; height: 190upx;"></view>
<view style="width: 112upx; padding-left: 8upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
:style="{height: (data.windowHeight - 160 * data.pixelRate) +'px'}" scroll-y
scroll-with-animation v-if="brandList.length > 0" >
<view :id="'s' + index" style="height: 140upx;"
:class="[index == brandCurrentId ? 'scroll-item-select' : 'scroll-item-no-select']"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)" >
<image
style="width: 60upx; height: 100upx; display: block;margin:auto; padding: 18upx;"
:src="item.icon" mode="aspectFit">
</image>
</view>
</scroll-view>
</view>
</view>
<view style="position: absolute; bottom: 0upx; left: 116upx; height: 100%; width: 100%;
z-index: 8; overflow: hidden; ">
<view style="width: calc(100% - 150upx); height: calc(100% - 180upx); position: relative;overflow: hidden;
border: 5upx 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="display: flex;flex-direction: column;">
<image
style="width: 130upx; 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>
</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>
</veiw>
</view>
<view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 5upx;
z-index: 9;
overflow: hidden;">
<view style="width: 10upx; margin-top: 190upx; " :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
:style="{height: (data.windowHeight - 160 * data.pixelRate) +'px'}" scroll-y
scroll-with-animation v-if="brandList.length > 0" >
<view :id="'s' + index" style="height: 140upx;"
:class="[index == brandCurrentId ? 'scroll-item-buttom-select' : 'scroll-item-buttom-no-select']"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)" >
<!-- <view style="width: 20upx; background: #fff;margin-left: 0upx ;height: 140upx" :style="{background: index == currentId ? '#fff' :'#00000000' }"> </view> -->
</view>
</scroll-view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
......@@ -649,7 +675,6 @@
import client from '../../util/script.js' // 封装全局变量
import {Base64} from "js-base64"
import CryptoJS from 'crypto-js';
import scrollModeView from './components/scrollModeView.vue';
/*** 色彩公园图片 DIY 功能页*/
var app = getApp(); // 当前APP实例
......@@ -676,7 +701,7 @@
firework,
bgColor,
tuya,
scrollModeView
isShowPop:false
},
computed: {},
data() {
......@@ -868,7 +893,11 @@
sizetext: "",
sizestock: "",
channel_no: "",
dict_id: ""
dict_id: "",
goods_id_e:{},
datalist:[],
isShowPop:false,
brandCurrentId: 0
};
},
......@@ -879,10 +908,57 @@
},
methods: {
cancelshowBrandShare(){
brandclick(index,item) {
this.brandCurrentId = index
item.machine_id = this.machine_id
this.open(item)
},
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 // 品牌机型
this.isShowPop = true;
}).catch(err => {
this.isShowPop = true;
uni.showToast({
title: err.msg,
icon: 'none'
});
});
},
modeDetail(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.goodsbrands({goods_id_e: this.goods_id_e})
}).catch(err => {
});
},
cancelshowBrandShare(){
this.$refs["showBrandShare"].close();
},
},
/**
* 读取图片失败操作
......@@ -900,8 +976,35 @@
//显示Ai转换
showAiChange() {
this.selectChangeType = 1;
this.$refs["showAiChange"].open();
if(this.data == null){
return
}
if(!this.active){
uni.showToast({
icon: "none",
title: "还没选中图片",
duration: 2000
});
return
}
if(this.data.itemList == null || this.data.itemList.length == 0){
uni.showToast({
icon: "none",
title: "还没选中图片",
duration: 2000
});
return
}
if(this.data.itemList[this.data.cidx].type == 0 && this.data.itemList[this.data.cidx].isUpLoadImage){
this.selectChangeType = 1;
this.$refs["showAiChange"].open();
}else{
uni.showToast({
icon: "none",
title: "Ai必须是上传图片类型",
duration: 2000
});
}
},
showAiChangeType(type) {
......@@ -1425,32 +1528,20 @@
.width - W1
) / 2
} else {
item.content =
atter.host +
'/' + atter
.dir + time +
'.jpg'
item.content = atter.host + '/' + atter.dir + time + '.jpg'
}
item.type =
0 //0为图片，1为文字，2为素材
item.type = 0 //0为图片，1为文字，2为素材
if (item.works_id !=
undefined) {
if (item.works_id >
0) {
_this.data
.works_idlenght--
item.material_id =
0
item.original_id =
0
item.works_id =
0
if (item.works_id > 0) {
_this.data.works_idlenght--
item.material_id =0
item.original_id = 0
item.works_id = 0
}
} else {
item.original_id =
0
item.material_id =
0
item.original_id = 0
item.material_id = 0
}
}
});
......@@ -1485,7 +1576,6 @@
sourceType: ['camera', 'album'], //从相册选择
count: 1,
success: (res) => {
//console.log(res.tempFilePaths)
let tempFilePaths = res.tempFilePaths;
//let tempFilePaths = 'http://ws.colorpark.cn/static/alioss/images/icon_picture.png';
var size = res.tempFiles[0].size;
......@@ -1548,9 +1638,7 @@
count: 1,
success: (res) => {
this.$refs['showpicture'].close();
//console.log(res.tempFilePaths)
let tempFilePaths = res.tempFilePaths;
// let tempFilePaths = 'http://ws.colorpark.cn/static/alioss/images/icon_picture.png';
var size = res.tempFiles[0].size;
var path = res.tempFiles[0].path;
var formatImage = path.split(".")[(path.split(".")).length - 1];
......@@ -1605,7 +1693,6 @@
},
//选择微信相片跟本地相册弹框取消
selectPicturePopColse() {
//this.delete_wrap_state = false
this.showone = false
this.$refs['showpicture'].close();
},
......@@ -1667,17 +1754,12 @@
let top = 0
let lef = 0
let ratio = image.width / image.height
let ratiowidth = (_this.data.editorWidth *
_this.mix_scale) / image.width
let ratioheight = (_this.data
.editorHeight * _this.mix_scale) /
image.height
width = _this.data.editorWidth * _this
.mix_scale
let ratiowidth = (_this.data.editorWidth * _this.mix_scale) / image.width
let ratioheight = (_this.data.editorHeight * _this.mix_scale) / image.height
width = _this.data.editorWidth * _this.mix_scale
height = image.height * ratiowidth
if (height / 2 > _this.editor_top) {
width = width * (_this.editor_top * 2 /
height)
width = width * (_this.editor_top * 2 / height)
height = _this.editor_top * 2
}
_this.isShowGif = true;
......@@ -1697,17 +1779,10 @@
font_size: '',
font_color: '',
under_color: '',
content: atter.host + '/' +
atter.dir + time +
'.jpg', // 图片地址
top: _this.editor_top -
height /
2, // 初始图片Y坐标，根据画布高/2-图片高/2
left: _this.data.editorWidth /
2 - width /
2, // 初始图片X坐标,因为div是相对定位，所以计算是要多减一次移动的距离
x: _this.data.editorWidth /
2, // 初始圆心位置，可再downImg之后又宽高和初始的图片位置得出
content: atter.host + '/' + atter.dir + time + '.jpg', // 图片地址
top: _this.editor_top - height / 2, // 初始图片Y坐标，根据画布高/2-图片高/2
left: _this.data.editorWidth / 2 - width / 2, // 初始图片X坐标,因为div是相对定位，所以计算是要多减一次移动的距离
x: _this.data.editorWidth / 2, // 初始圆心位置，可再downImg之后又宽高和初始的图片位置得出
y: _this.editor_top,
scale: 1, // 缩放比例 1为不缩放
lastScale: 1, // 上一次的绽放比例
......@@ -1718,7 +1793,7 @@
width: width, // 预设生成图片的宽度
height: height, // 预设生成图片的高度
rScale: 1, // 图片原始缩放比例
// 新增加默认属性
//新增加默认属性
activeguide: false, // 开启辅助线
activescale: false, // 开启旋转状态
activehorn: false, // 开启角状态
......@@ -1745,8 +1820,7 @@
fail: function(err) {
_this.isUpLoadImage = false;
failUp++;
//console.log(err)
wx.showToast({
uni.showToast({
title: '上传失败！',
icon: 'none',
duration: 1200
......@@ -1762,9 +1836,9 @@
}
})
},
goodsbrands(obj) {
this.$refs['showBrandShare'].close();
this.isShowPop =false;
this.isCustomize = false; //充值自定义
this.filletSize = 0 //设置圆角
this.isCustomizeComplete = false
......@@ -1796,7 +1870,7 @@
icon: 'none'
});
});
// 锁定库存
//锁定库存
homeservice.queryList({
s: 'Order.newLockAttrStock',
machine_id: this.machine_id, //设备id
......@@ -1806,6 +1880,11 @@
}).then(result => {
this.$base.lockInventory = result //锁库存储存信息
this.sn = result.sn
this.sizetext_id = this.$base.lockInventory.id
this.sizetext = this.$base.lockInventory.goods_size
this.sizestock = this.$base.lockInventory.stock
this.channel_no = this.$base.lockInventory.channel_no
this.dict_id = this.$base.lockInventory.dict_id
this.orderUpdateSn() //定时器锁库存
}).catch(err => {
uni.showToast({
......@@ -1924,13 +2003,9 @@
item.rotate = item.angle
width = (item.width * item.scale);
height = (item.height * item.scale);
left = item.left;
top = item.top;
scalePos = this.calNoScalePos(left, top, width, height);
item.centerPos = {
x: left + width / 2,
y: top + height / 2
......@@ -2022,7 +2097,6 @@
if (this.background_color != null && this.background_color != "none") {
getBackColor = this.background_color;
}
let customize;
let name;
let print_width;
......@@ -2030,9 +2104,7 @@
let print_left;
let print_top;
let print_radius;
let data = {};
if (this.isCustomize) {
customize = 1
name = this.options.name;
......@@ -2041,7 +2113,6 @@
print_left = this.options.left / 3;
print_top = this.options.top / 3;
print_radius = this.options.fillet / 3;
data = {
s: 'Works.save',
components: components,
......@@ -2083,7 +2154,6 @@
background_color: getBackColor, //手机壳背景颜
}
}
homeservice.Workssave(data).then(result => {
uni.hideLoading();
uni.showToast({
......@@ -2120,20 +2190,11 @@
});
}
},
self_help(loading, works_id) {
/* 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
})
return */
let data = {
s: 'Order.create',
// type: this.key, //1：配送版，2：单机版，3：自助版
//type: this.key, //1：配送版，2：单机版，3：自助版
type: 3, //1：配送版，2：单机版，3：自助版
machine_id: this.machine_id, //设备
goods_id: this.data.goods_id, //产品
......@@ -2148,8 +2209,6 @@
coupon_id: null, //优惠券id，支付多个id( 1-2-3)
user_address: null, //地址
support_pay: 1, //单机版是否支付
}
if (this.coupon.ids != undefined) {
......@@ -2170,8 +2229,6 @@
});
isclick = true;
});
/* if (this.support_pay == 1) {
uni.navigateTo({
url: '../mine/order?goodid=' + works_id + '&machine_id=' + this
......@@ -2255,7 +2312,8 @@
key:"3"
}).then(result => {
this.brandList = result;
this.$refs['showBrandShare'].open()
//this.isShowPop = true;
//this.$refs['showBrandShare'].open()
if(this.brandList != null && this.brandList.length > 0 ){
this.brandclick(0,this.brandList[0])
}
......@@ -2266,13 +2324,6 @@
});
});
},
brandclick(index,item) {
this.currentIdBrand = index
item.machine_id = this.machine_id
this.$refs['scrollModeView'].open(item)
},
onok(item) {
......@@ -2961,7 +3012,7 @@
if (!this.isHasClick) {
return;
}
this.isShowGif = false;
//this.isShowGif = false;
this.$refs['show' + type].close()
this.addtext = false
if (wx.pageScrollTo) {
......@@ -3356,7 +3407,7 @@
* @return void
*/
itemClick(e) {
this.isShowGif = false;
//this.isShowGif = false;
this.isShowMoveMaterial = false;
this.drag_text_context = "单指可拖拽";
this.cutting_text_context = "双指可伸缩";
......@@ -3398,7 +3449,7 @@
//点击画布区域取消聚焦
itemCancel(e) {
//console.log('点击画布区域取消聚焦')
this.isShowGif = false;
//this.isShowGif = false;
this.isShowMoveMaterial = true;
this.drag_text_context = "单击可选中";
this.cutting_text_context = "双击可裁剪";
......@@ -4711,7 +4762,7 @@
this.infoListTouchEvent = infoListTouchEvent;
this.infoListTouchEvent.bind({
doubleTap: function(e) { //是双击事件
this.isShowGif = false;
//this.isShowGif = false;
if (items[index].type == 0) {
that.state = true
that.$refs.index.init();
......@@ -4722,7 +4773,7 @@
that.active = false;
that.guide_left = false
} else {
that.isShowGif = false;
//that.isShowGif = false;
that.isShowMoveMaterial = false;
that.drag_text_context = "单指可拖拽";
that.cutting_text_context = "双指可伸缩";
......@@ -4783,7 +4834,7 @@
}
},
touchCancel: function(e) { //手机触摸取消
that.isShowGif = false;
//that.isShowGif = false;
that.isShowMoveMaterial = true;
that.drag_text_context = "单击可选中";
that.cutting_text_context = "双击可裁剪";
......@@ -5091,16 +5142,6 @@
this.isCustomize = true;
this.data.goods_id = this.options.goods_id // 商品id
}
}else{
/* 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;
this.data.goods_id = 301// 商品id
} */
}
if (this.isCustomize) {
......@@ -5113,7 +5154,6 @@
if(this.data.goods_id == undefined || this.data.goods_id == "" ){
this.data.goods_id = 301
}
//获取产品详情数据
this.goodslist()
}
}
......@@ -5523,9 +5563,9 @@
// 底部工具栏
.toolRight {
position: fixed;
top: 300upx;
top: 440upx;
right: 0;
width: 120upx;
width: 100upx;
.tool_li {
width: 100%;
......@@ -5682,15 +5722,29 @@
}
.scroll-item-select{
//background: #864BC3;
border: 1upx solid #61D119;
.scroll-item-select{
//border: 1upx solid #61D119;
border-top: 5upx solid #61D119;
border-bottom: 5upx solid #61D119;
border-left: 5upx solid #61D119;
border-right: 5upx solid #fff;
}
.scroll-item-no-select{
border: 1upx solid #00000000;
//background: #864BC3;
}
.scroll-item-buttom-select{
border: 5upx solid #fff;
}
.scroll-item-buttom-no-select{
border: 1upx solid #00000000;
}
</style>
\ No newline at end of file
pages/index/start-up.vue
......@@ -71,43 +71,90 @@
</view>
</view>
<uni-popup ref="showshare" type="bottom"
style="position: relative; z-index: 9998; width: 100%; " :style="{height: data.windowHeight +'px'}">
<view class="uni-share full-width" :style="{height: data.windowHeight +'px'}">
<view style="position: absolute; bottom: 0; left: 0; height: 100%; width: 100%; z-index: 997; opacity: 0.8;"
@click="cancel('share')"/>
<view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 120upx;
z-index: 999; background: #1A1D33;
overflow: hidden;">
<view style="width: 120upx; height: 188upx;"></view>
<view style="width: 120upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
:style="{height: (data.windowHeight - 160 * data.pixelRate) +'px'}" scroll-y
scroll-with-animation v-if="brandList.length > 0" >
<view :id="'s' + index"
:class="[index == currentId ? 'scroll-item-select' : 'scroll-item-no-select']"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)">
<image
style="width: 60upx; height: 100upx; display: block;margin:auto; padding: 18upx;"
:src="item.icon" mode="aspectFit">
</image>
<view v-if="isShowPop"
style="z-index: 999999; width: 100%; height: 100%; position: absolute; top: 0upx; left: 0upx" :style="{height: data.windowHeight +'px'}">
<view class="uni-share full-width" :style="{height: data.windowHeight +'px'}" style="background: #fff;">
<view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 120upx;
z-index: 7;
overflow: hidden;">
<view style="width: 120upx; height: 190upx;"></view>
<view style="width: 112upx; padding-left: 8upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
:style="{height: (data.windowHeight - 160 * data.pixelRate) +'px'}" scroll-y
scroll-with-animation v-if="brandList.length > 0" >
<view :id="'s' + index" style="height: 140upx;"
:class="[index == currentId ? 'scroll-item-select' : 'scroll-item-no-select']"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)" >
<image
style="width: 60upx; height: 100upx; display: block;margin:auto; padding: 18upx;"
:src="item.icon" mode="aspectFit">
</image>
</view>
</scroll-view>
</view>
</view>
<view style="position: absolute; bottom: 0upx; left: 116upx; height: 100%; width: 100%;
z-index: 8; overflow: hidden; ">
<view style="width: calc(100% - 150upx); height: calc(100% - 180upx); position: relative;overflow: hidden;
border: 4upx solid #61D119; margin-top: 140upx; margin-right: 10upx; ">
<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="display: flex;flex-direction: column;">
<image
style="width: 130upx; 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>
</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>
</view>
</veiw>
</view>
<view style="position: absolute; bottom: 0upx; left: 0;
height: 100%; width: 5upx;
z-index: 9;
overflow: hidden;">
<view style="width: 5upx; padding-left: 0upx; margin-top: 190upx;" :style="{height: (data.windowHeight - 188 * data.pixelRate) +'px'}">
<scroll-view class="scroll-container"
:style="{height: (data.windowHeight - 160 * data.pixelRate) +'px'}" scroll-y
scroll-with-animation v-if="brandList.length > 0" >
<view :id="'s' + index" style="height: 140upx;"
:class="[index == currentId ? 'scroll-item-buttom-select' : 'scroll-item-buttom-no-select']"
v-for="(item, index) in brandList" :key="index" @tap="brandclick(index,item)" >
<!-- <view style="width: 20upx; background: #fff;margin-left: 0upx ;height: 140upx" :style="{background: index == currentId ? '#fff' :'#00000000' }"> </view> -->
</view>
<view style="position: absolute; bottom: 0upx; left: 120upx; height: 100%; width: calc(100% - 200upx);
z-index: 999; overflow: hidden; background: #fff;">
<scrollModeView ref="scrollModeView"
@goodsbrands="goodsbrands"
:windowHeight="(data.windowHeight - 210 * data.pixelRate - classificationHeight)">
</scrollModeView>
</scroll-view>
</view>
</view>
</view>
</view>
</uni-popup>
<!-- 手机壳品牌 -->
<switchBrands ref="switchBrands" @goodsbrands="goodsbrands" @toCustomSize="toCustomSize()"></switchBrands>
</view>
<!-- 登录弹框 -->
<Signin ref="Signin"></Signin>
......@@ -173,19 +220,75 @@
},
currentId: 0,
classificationHeight: 0,
goods_id_e:{},
datalist:[],
isShowPop:false
};
},
methods: {
cancel(type) {
this.$refs['showshare'].close()
this.isShowPop = false
//this.$refs['showshare'].close()
},
//关闭所有弹窗回调事件
change(e) {
},
modeDetail(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.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'
// });
});
},
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 // 品牌机型
this.isShowPop = true;
}).catch(err => {
this.isShowPop = true;
uni.showToast({
title: err.msg,
icon: 'none'
});
});
},
getBrandList() {
homeservice.queryList({
......@@ -195,7 +298,7 @@
}).then(result => {
this.brandList = result;
this.isNowCustomized = false;
this.$refs['showshare'].open()
//this.$refs['showshare'].open()
if(this.brandList != null && this.brandList.length > 0 ){
this.brandclick(0,this.brandList[0])
}
......@@ -210,7 +313,8 @@
brandclick(index,item) {
this.currentId = index
item.machine_id = this.machine_id
this.$refs['scrollModeView'].open(item)
this.open(item)
//this.$refs['scrollModeView'].open(item)
},
modelclick(e) {
......@@ -274,12 +378,14 @@
},
goodsbrands(obj) {
this.$refs['showshare'].close()
//this.$refs['showshare'].close()
this.brandtext = obj.goods_id_e.modeltext // 品牌名
this.modeltext = obj.goods_id_e.modeltext //机型名
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
},
game() {
......@@ -570,10 +676,6 @@
this.msg = "稍等片刻,我很快恢复"
this.myheadtext = '歇一歇' //头部标题栏
this.statusloading = 2
/* var url = Env.getBaseURL();
if (url.indexOf("refinecolor") != -1) {
this.statusloading = 1
} */
uni.stopPullDownRefresh();
uni.hideLoading();
return;
......@@ -715,7 +817,6 @@
font-size: 26upx;
}
.noexperiencebutton {
width: 230upx;
height: 70upx;
......@@ -728,7 +829,6 @@
font-size: 26upx;
}
.loginBtn-hover {
background: linear-gradient(to left, #64DD17, #64DD17);
}
......@@ -819,14 +919,29 @@
}
.scroll-item-select{
//background: #864BC3;
border: 1upx solid #61D119;
//border: 1upx solid #61D119;
border-top: 5upx solid #61D119;
border-bottom: 5upx solid #61D119;
border-left: 5upx solid #61D119;
border-right: 5upx solid #fff;
}
.scroll-item-no-select{
border: 1upx solid #00000000;
//background: #864BC3;
}
.scroll-item-buttom-select{
border: 5upx solid #fff;
/* border-top: 3upx solid #61D119;
border-bottom: 3upx solid #61D119;
border-left: 3upx solid #fff;
border-right: 3upx solid #fff; */
}
.scroll-item-buttom-no-select{
border: 1upx solid #00000000;
}
</style>
\ No newline at end of file
pages/mall/lineUp.vue
......@@ -335,7 +335,7 @@
.border-image-pesudo-in {
width: 100%;
height: 100%;
background: #282932;
background: #fff;
//background-color: rgba(255,255,255,0.7);
}
}
......@@ -344,7 +344,7 @@
.border-image-pesudo-no {
width: 150upx;
height: 150upx;
background: #131319;
background: #fff;
margin: 25upx 35upx;
margin-left: 0upx;
......@@ -356,7 +356,7 @@
.border-image-pesudo-in-no {
width: 100%;
height: 100%;
background: #282932;
background: #fff;
//background-color: rgba(255,255,255,0.7);
}
}
......
static/icon_diy_ai.png
static/icon_diy_ai.png

789 Bytes | W: | H:

static/icon_diy_ai.png

671 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
......@@ -3,15 +3,10 @@ if(!accountInfo.miniProgram.envVersion){
//console.error("获取运行环境失败!");
}
/* img.kexiaozhan.cn
render.kexiaozhan.cn
ws.kexiaozhan.cn
print.kexiaozhan.cn */
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",
//正式版
......@@ -26,7 +21,6 @@ const Env = {
getAppID: () => "wxdca8810ccd426633",
getcompany: () => "广州壳小站科技有限公司",
getappId: () => "wx55b5b6d95c648041",
//getenvVersion: () => "trial",
getenvVersion: () => "release",
}
export default Env
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