Skip to content

W
wechat_baking
Commit 44af7cee by huahua
Options

提交

parent f77e3f66
Showing with 569 additions and 1099 deletions
.hbuilderx/launch.json 0 → 100644
{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"default" :
{
"launchtype" : "local"
},
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
]
}
api/UserApi.js
......@@ -7,4 +7,4 @@ import {
* 登录
* @param {*} params
*/
export const _login = (params = {}) => _request({url: '/lite/index', params, method: 'post', contentType: Enums.ContentType.FORM_UTF8})
export const _login = (params = {}) => _request({url: '/baking/index', params, method: 'post', contentType: Enums.ContentType.FORM_UTF8})
api/homeApi.js
......@@ -8,8 +8,8 @@ import {
*
* @param {*} params
*/
export const route = (params = {}) => _request({url: '/lite/index', params, method: 'post',token: true})
export const route = (params = {}) => _request({url: '/baking/index', params, method: 'post',token: true})
export const route_timeout = (params = {}) => _request({url: '/lite/index', params, method: 'post',token: true,timeout: true})
export const route_timeout = (params = {}) => _request({url: '/baking/index', params, method: 'post',token: true,timeout: true})
export const newroute = (params = {}) => _request({url: '/lite/index/index', params, method: 'post',token: true})
\ No newline at end of file
export const newroute = (params = {}) => _request({url: '/lite/baking/index/index', params, method: 'post',token: true})
\ No newline at end of file
components/cropper/readme.md
......@@ -75,5 +75,6 @@ page {
--safe-area-inset-bottom: env(safe-area-inset-bottom);
--safe-area-inset-left: env(safe-area-inset-left);
}
}
```
\ No newline at end of file
components/fr-image/fr-image.vue
......@@ -49,8 +49,7 @@
default: false,
},
// 可选： 加载失败图片：可以本地url、网络url、base64 （与src一致）
//可选： 加载失败图片：可以本地url、网络url、base64 （与src一致）
loadingErrorImg: {
type: String,
default: require('./loading_error.png'),
......
components/ksp-image-cutter/ksp-image-cutter.vue
<template>
<view v-show="properties.content" class="ksp-image-cutter" @tap="onok"
style="position: relative; width: 100%; height: 100%; overflow: hidden;">
<view v-show="properties.content" class="ksp-image-cutter" @tap="onok"
style="position: relative; width: 100%; height: 100%; overflow: hidden;">
<view class="body">
<!-- 背景图 -->
<!-- <image v-if="properties.content" class="image" @load="imageLoad" :style="{left: image.left + 'px', top: image.top + 'px',
width: image.width + 'px', height: image.height + 'px',transform: 'rotate(' + properties.angle + 'deg)'}"
:src="properties.content"></image> -->
<view v-if="mask.show" class="mask"></view>
<!-- 窗口 -->
<view @touchstart="touchStart($event, 'plank')" :data-time="lastTapTime"
@touchmove="touchMove" @touchend="touchEnd" @touchcancel="touchCancel"
class="plank" :style="{transform: 'rotate(' + properties.angle + 'deg)'}">
<view class="frame" @touchstart="touchStart($event, 'frame')" @touchstart.stop.prevent="touchHandle" :data-time="lastTapTime"
:style="{left: frame.left + 'px', top: frame.top + 'px',
width: frame.width + 'px', height: frame.height + 'px'}">
<view @touchstart="touchStart($event, 'plank')" :data-time="lastTapTime" @touchmove="touchMove"
@touchend="touchEnd" @touchcancel="touchCancel" class="plank"
:style="{transform: 'rotate(' + properties.angle + 'deg)'}">
<view class="frame" @touchstart="touchStart($event, 'frame')" @touchstart.stop.prevent="touchHandle"
:data-time="lastTapTime" :style="{left: frame.left + 'px', top: frame.top + 'px',
width: frame.width + 'px', height: frame.height + 'px'}">
<!-- 图片 -->
<image v-if="properties.content" class="image" :data-time="lastTapTime" @load="imageLoad"
:style="{'margin-left': -(frame.left - image.left) + 'px', 'margin-top': -(frame.top - image.top) + 'px',
width: image.width + 'px', height: image.height + 'px'}"
:src="properties.content"></image>
<image v-if="properties.content" class="image" :data-time="lastTapTime" @load="imageLoad" :style="{'margin-left': -(frame.left - image.left) + 'px', 'margin-top': -(frame.top - image.top) + 'px',
width: image.width + 'px', height: image.height + 'px'}" :src="properties.content"></image>
<view class="rect"></view>
<view class="line-one"></view>
<view class="line-two"></view>
<view class="line-three"></view>
<view class="line-four"></view>
<view @touchstart="touchStart($event, 'left')" @touchstart.stop.prevent="touchHandle" class="frame-left">
<view @touchstart="touchStart($event, 'left')" @touchstart.stop.prevent="touchHandle"
class="frame-left">
<view class='left_edge'></view>
</view>
<view @touchstart="touchStart($event, 'right')" @touchstart.stop.prevent="touchHandle" class="frame-right">
<view @touchstart="touchStart($event, 'right')" @touchstart.stop.prevent="touchHandle"
class="frame-right">
<view class='rightedge'> </view>
</view>
<view @touchstart="touchStart($event, 'top')" @touchstart.stop.prevent="touchHandle" class="frame-top">
<view @touchstart="touchStart($event, 'top')" @touchstart.stop.prevent="touchHandle"
class="frame-top">
<view class='topedge'> </view>
</view>
<view @touchstart="touchStart($event, 'bottom')" @touchstart.stop.prevent="touchHandle" class="frame-bottom">
<view @touchstart="touchStart($event, 'bottom')" @touchstart.stop.prevent="touchHandle"
class="frame-bottom">
<view class='bottomedge'> </view>
</view>
<view @touchstart="touchStart($event, 'left-top')" @touchstart.stop.prevent="touchHandle" class="frame-left-top-wrap">
<view @touchstart="touchStart($event, 'left-top')" @touchstart.stop.prevent="touchHandle"
class="frame-left-top-wrap">
<view class='frame-left-top'> </view>
</view>
<view @touchstart="touchStart($event, 'left-bottom')" @touchstart.stop.prevent="touchHandle" class="frame-left-bottom-wrap">
<view @touchstart="touchStart($event, 'left-bottom')" @touchstart.stop.prevent="touchHandle"
class="frame-left-bottom-wrap">
<view class='frame-left-bottom'> </view>
</view>
<view @touchstart="touchStart($event, 'right-top')" @touchstart.stop.prevent="touchHandle" class="frame-right-top-wrap">
<view @touchstart="touchStart($event, 'right-top')" @touchstart.stop.prevent="touchHandle"
class="frame-right-top-wrap">
<view class='frame-right-top'> </view>
</view>
<view @touchstart="touchStart($event, 'right-bottom')" @touchstart.stop.prevent="touchHandle" class="frame-right-bottom-wrap">
<view @touchstart="touchStart($event, 'right-bottom')" @touchstart.stop.prevent="touchHandle"
class="frame-right-bottom-wrap">
<view class='frame-right-bottom'> </view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import drag from '../../pages/index/js/drag.js'// 封装
// 封装
import drag from '../../pages/index/js/drag.js'
export default {
props: {
properties: {
......@@ -143,7 +146,7 @@
timeoutId: -1,
context: Object,
targetContext: Object,
// 后添加属性值
//后添加属性值
Centerleft: null,
Centertop: null,
lastTapTime: 0, //判断点击时间间隔
......@@ -159,13 +162,13 @@
// this.targetContext = uni.createCanvasContext("target", this);
},
methods: {
doubleTap(e){
doubleTap(e) {
console.log(e)
var curTime = e.timeStamp
var lastTime = e.currentTarget.dataset.time // 通过e.currentTarget.dataset.time 访问到绑定到该组件的自定义数据
if (curTime - lastTime > 0) {
if (curTime - lastTime < 300) { //是双击事件
}
}
this.lastTapTime = curTime
......@@ -184,7 +187,6 @@
} = wx.getSystemInfoSync()
let clipSize = windowWidth / 750
let clipHeight = windowHeight / 1206
// console.log(windowHeight / windowWidth)
// 计算宽度高度
this.real.width = this.properties.initialWidth * this.properties.initialScale
this.real.height = this.properties.initialHeight * this.properties.initialScale
......@@ -194,6 +196,17 @@
this.frame.width = this.properties.width;
this.frame.height = this.properties.height;
this.frame.angle = this.properties.angle;
let rotate = Math.abs(this.frame.angle) % 360 //计算角度
if (this.frame.angle < 0) {
let multiple = Math.ceil(Math.abs(this.frame.angle) / 360) //Math.ceil
rotate = this.frame.angle + multiple * 360
}
if (rotate == 360) {
rotate = 0;
}
this.frame.rotate = rotate; //设置新旋转角度
// 默认居中
this.Centerleft = (windowWidth - this.properties.width) / 2 - this.properties.frame_left
this.Centertop = (windowHeight - this.properties.height) / 2 - this.properties.frame_top
......@@ -220,10 +233,9 @@
},
imageLoad(ev) {
this.mask.show = true;
},
touchHandle(ev) {
console.log(ev)
//console.log(ev)
var curTime = ev.timeStamp
var lastTime = ev.currentTarget.dataset.time // 通过e.currentTarget.dataset.time 访问到绑定到该组件的自定义数据
if (curTime - lastTime > 0) {
......@@ -262,7 +274,7 @@
} else {
this.scaleFrame(this.touches[0], touches[0], this.type);
}
} else if (this.touches.length == 2 && touches.length == 2) {
// 双指头操作
var ta = this.touches[0];
......@@ -280,13 +292,38 @@
touchEnd(ev) {
this.type = "";
this.touches = [];
drag.getTransferPosition(this.frame.left, this.frame.top, this.frame.width, this.frame.height, this.frame.angle, this.frame.centerPos,this.frame)
drag.getTransferPosition(this.image.left, this.image.top, this.image.width, this.image.height, this.image.angle, this.image.centerPos,this.image)
drag.getTransferPosition(this.frame.left, this.frame.top, this.frame.width, this.frame.height, this.frame
.angle, this.frame.centerPos, this.frame)
drag.getTransferPosition(this.image.left, this.image.top, this.image.width, this.image.height, this.image
.angle, this.image.centerPos, this.image)
},
touchCancel(ev) {
this.type = "";
this.touches = [];
},
//计算距离
calculateDistance(dx, dy) {
let c = Math.sqrt(Math.pow(dx, 2) + Math.pow(dy, 2)) //使用三角公式计算边c长度
let angle = this.getAngle(dx, dy) //计算移动位置角度差
let rad = (Math.PI / 180) * (angle - this.frame.rotate) //旋转角度转换公式
let diffY = (Math.sin(rad) * c) //计算角度差x轴
let diffX = (Math.cos(rad) * c) //计算角度差y轴
return {
x: diffX,
y: diffY
};
},
//计算相差角度
getAngle(x, y) {
let theta = Math.atan2(y, x) // range (-PI, PI]
theta = Math.round((180 / Math.PI) * theta) // rads to degs, range (-180, 180]
if (theta < 0) theta = 360 + theta // range [0, 360)
return theta
},
moveImage(ta, tb) {
// 计算角度
// let roat = Math.abs(this.properties.angle) % 360
......@@ -294,9 +331,16 @@
// let multiple = Math.ceil(Math.abs(this.properties.angle) / 360)
// roat = this.properties.angle + multiple * 360
// }
var ax = tb.clientX - ta.clientX;
var ay = tb.clientY - ta.clientY;
let distance = this.calculateDistance(ax, ay);
ax = distance.x;
ay = distance.y;
this.image.left = this.start.image.left + ax;
this.image.top = this.start.image.top + ay;
if (this.image.left > this.frame.left) {
......@@ -355,83 +399,88 @@
if (this.image.top + this.image.height < this.frame.top + this.frame.height) {
this.image.top = this.frame.top + this.frame.height - this.image.height;
}
},
scaleFrame(ta, tb, type) {
// 计算角度
var ax = tb.clientX - ta.clientX;
var ay = tb.clientY - ta.clientY;
let distance = this.calculateDistance(ax, ay);
ax = distance.x;
ay = distance.y;
var x1 = this.start.frame.left;
var y1 = this.start.frame.top;
var x2 = this.start.frame.left + this.start.frame.width;
var y2 = this.start.frame.top + this.start.frame.height;
if (type == "left") {
x1 += ax;
this.frame.width = x2 - x1;
if(this.frame.width <= 50){
if (this.frame.width <= 50) {
x1 = x2 - 50
}
} else if (type == "right") {
x2 += ax;
this.frame.width = x2 - x1;
if(this.frame.width <= 50){
if (this.frame.width <= 50) {
x2 = x1 + 50
}
} else if (type == "top") {
y1 += ay;
this.frame.height = y2 - y1;
if(this.frame.height <= 50){
if (this.frame.height <= 50) {
y1 = y2 - 50
}
} else if (type == "bottom") {
y2 += ay;
this.frame.height = y2 - y1;
if(this.frame.height <= 50){
if (this.frame.height <= 50) {
y2 = y1 + 50
}
} else if (type == "left-top") {
x1 += ax;
y1 += ay;
this.frame.width = x2 - x1;
if(this.frame.width <= 50){
if (this.frame.width <= 50) {
x1 = x2 - 50
}
this.frame.height = y2 - y1;
if(this.frame.height <= 50){
if (this.frame.height <= 50) {
y1 = y2 - 50
}
} else if (type == "left-bottom") {
x1 += ax;
y2 += ay;
this.frame.width = x2 - x1;
if(this.frame.width <= 50){
if (this.frame.width <= 50) {
x1 = x2 - 50
}
this.frame.height = y2 - y1;
if(this.frame.height <= 50){
if (this.frame.height <= 50) {
y2 = y1 + 50
}
} else if (type == "right-top") {
x2 += ax;
y1 += ay;
this.frame.width = x2 - x1;
if(this.frame.width <= 50){
if (this.frame.width <= 50) {
x2 = x1 + 50
}
this.frame.height = y2 - y1;
if(this.frame.height <= 50){
if (this.frame.height <= 50) {
y1 = y2 - 50
}
} else if (type == "right-bottom") {
x2 += ax;
y2 += ay;
this.frame.width = x2 - x1;
if(this.frame.width <= 50){
if (this.frame.width <= 50) {
x2 = x1 + 50
}
this.frame.height = y2 - y1;
if(this.frame.height <= 50){
if (this.frame.height <= 50) {
y2 = y1 + 50
}
}
......@@ -447,17 +496,13 @@
if (y2 > this.image.top + this.image.height) {
y2 = this.image.top + this.image.height;
}
this.frame.left = x1;
this.frame.top = y1;
this.frame.width = x2 - x1;
this.frame.height = y2 - y1;
},
onok() {
var scale = this.image.width / this.real.width;
var x = (this.frame.left - this.image.left) / scale;
var y = (this.frame.top - this.image.top) / scale;
......@@ -465,22 +510,7 @@
var height = this.frame.height / scale;
var tw = width;
var th = height;
// if (this.fixed) {
// tw = this.width / 2;
// th = this.height / 2;
// } else {
// if (tw > this.maxWidth / 2) {
// var sc = this.maxWidth / 2 / tw;
// tw = tw * sc;
// th = th * sc;
// }
// if (th > this.maxHeight / 2) {
// var sc = this.maxHeight / 2 / th;
// th = th * sc;
// tw = tw * sc;
// }
// }
this.target.width = tw;
this.target.height = th;
......@@ -520,7 +550,7 @@
bottom: 0;
z-index: 1000;
}
.body {
position: absolute;
left: 0upx;
......@@ -614,6 +644,7 @@
height: 100%;
top: 0;
background: transparent;
.left_edge {
position: absolute;
z-index: 99;
......@@ -624,7 +655,7 @@
top: calc(50% - 20upx);
}
}
.frame-right {
position: absolute;
z-index: 99;
......@@ -633,6 +664,7 @@
height: 100%;
background: transparent;
top: 0;
.rightedge {
position: absolute;
z-index: 99;
......@@ -654,6 +686,7 @@
left: 0;
right: 0;
margin: auto;
.topedge {
position: absolute;
z-index: 99;
......@@ -677,6 +710,7 @@
left: 0;
right: 0;
margin: auto;
.bottomedge {
position: absolute;
z-index: 99;
......@@ -689,7 +723,7 @@
margin: auto;
}
}
.left_edge::after,
.rightedge::after,
.topedge::after,
......@@ -702,7 +736,7 @@
bottom: 0;
transform: scale(2);
}
.frame-left-top-wrap {
position: absolute;
z-index: 100;
......@@ -710,7 +744,8 @@
height: 60upx;
left: -30upx;
top: -30upx;
.frame-left-top{
.frame-left-top {
position: absolute;
z-index: 100;
width: 30upx;
......@@ -729,6 +764,7 @@
height: 60upx;
left: -30upx;
bottom: -30upx;
.frame-left-bottom {
position: absolute;
z-index: 100;
......@@ -748,6 +784,7 @@
height: 60upx;
right: -30upx;
top: -30upx;
.frame-right-top {
position: absolute;
z-index: 100;
......@@ -767,6 +804,7 @@
height: 60upx;
right: -30upx;
bottom: -30upx;
.frame-right-bottom {
position: absolute;
z-index: 100;
......@@ -778,14 +816,17 @@
border-bottom: 6upx solid #5CE6B5;
}
}
.frame-left-top::after,.frame-right-top::after,
.frame-left-bottom::after,.frame-right-bottom::after{
content: '';
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
transform: scale(1.5);
.frame-left-top::after,
.frame-right-top::after,
.frame-left-bottom::after,
.frame-right-bottom::after {
content: '';
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
transform: scale(1.5);
}
</style>
components/mpvue-citypicker/mpvueCityPicker.vue
......@@ -34,7 +34,7 @@ export default {
provinceDataList: [],
cityDataList: [],
areaDataList: [],
/* 是否显示控件 */
/*是否显示控件 */
showPicker: false,
};
},
......@@ -64,7 +64,7 @@ export default {
this.cityDataList = cityData[this.pickerValueDefault[0]];
this.areaDataList = areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]];
this.pickerValue = this.pickerValueDefault;
},
},
show() {
setTimeout(() => {
this.showPicker = true;
......
components/toolbar/toolbar.vue
......@@ -31,15 +31,9 @@
</view>
<view class="pen-section">
<view style="display: flex; align-items: center; justify-content: center;">
<!-- <view class="pen" :style="{backgroundColor: penColor, height: lineWidth}"></view>
<view class="triangle-right"
:style="{'border-top': (lineValue / 2) + 'px solid transparent',
'border-left': lineValue + 'px solid' + penColor,
'border-bottom': (lineValue / 2) + 'px solid transparent',}"></view> -->
<view style="font-size: 25upx; margin-right: 16upx; color: #FFFFFF;">画笔大小</view>
</view>
<slider min="1" max="20" :value="lineValue" block-size="25" activeColor="#FFFFFF" class="pen-slider" @change="penWidthChange"/>
<!-- <view class="pen-txt">{{lineWidth}}</view> -->
</view>
</view>
</template>
......
components/uni-calendar/calendar.js
......@@ -13,7 +13,6 @@
*/
/* eslint-disable */
var calendar = {
/**
* 农历1900-2100的润大小信息表
* @Array Of Property
......
components/uni-calendar/util.js
......@@ -21,8 +21,8 @@ class Calendar {
this.cleanMultipleStatus()
// 每周日期
this.weeks = {}
// this._getWeek(this.date.fullDate)
}
/**
* 设置日期
* @param {Object} date
......@@ -49,7 +49,6 @@ class Calendar {
resetSatrtDate(startDate) {
// 范围开始
this.startDate = startDate
}
/**
......@@ -98,7 +97,6 @@ class Calendar {
}
}
/**
* 获取上月剩余天数
*/
......@@ -115,6 +113,7 @@ class Calendar {
}
return dateArr
}
/**
* 获取本月天数
*/
......@@ -123,9 +122,7 @@ class Calendar {
let fullDate = this.date.fullDate
for (let i = 1; i <= dateData; i++) {
let isinfo = false
let nowDate = full.year + '-' + (full.month < 10 ?
full.month : full.month) + '-' + (i < 10 ?
'0' + i : i)
let nowDate = full.year + '-' + (full.month < 10 ?full.month : full.month) + '-' + (i < 10 ?'0' + i : i)
// 是否今天
let isDay = fullDate === nowDate
// 获取打点信息
......@@ -135,7 +132,7 @@ class Calendar {
}
})
// 日期禁用
//日期禁用
let disableBefore = true
let disableAfter = true
if (this.startDate) {
......@@ -180,6 +177,7 @@ class Calendar {
}
return dateArr
}
/**
* 获取下月天数
*/
......@@ -238,7 +236,6 @@ class Calendar {
}
}
/**
* 获取日期范围内所有日期
* @param {Object} begin
......@@ -260,12 +257,14 @@ class Calendar {
}
return arr
}
/**
* 计算阴历日期显示
*/
getlunar(year, month, date) {
return CALENDAR.solar2lunar(year, month, date)
}
/**
* 设置打点
*/
......
components/uni-fab/uni-fab.vue
......@@ -45,7 +45,6 @@
// #ifdef APP-NVUE
platform = uni.getSystemInfoSync().platform
// #endif
/**
* Fab 悬浮按钮
* @description 点击可展开一个图形按钮菜单
......
components/xing-refresh/完全自定义的带有下拉刷新的scroll-view组件.md
## 完全自定义的带有下拉刷新的scroll-view组件
## 完全自定义的带有下拉刷新的scroll-view组件
......@@ -38,7 +38,7 @@ upRefresh: {
​ moveMax: {
​ //可下拉的最大距离 指手指滑动的距离(px) 超出后会被截断 此时下拉框已经完全显示 即已经到达
//下面属性topHeight的高度
//下面属性topHeight的高度
​ type: Number,
......
pages/index/index.vue
......@@ -21,24 +21,26 @@
<view class="full-width full-height" style="position: absolute; top: 0; left: 0;" @click.stop="itemCancel">
</view>
<view class="container" @click='itemCancel' @touchmove.stop="touchMove" @touchend.stop="touchEnd">
<view :style="{width: data.bgWidth +'px',height: data.bgHeight +'px' }" style="position: relative; ">
<image :src="data.bgImage_old" mode="widthFix"
<view :style="{width: data.bgWidth +'px',height: data.bgHeight +'px'}" style="position: relative; ">
<!-- <image :src="data.bgImage_old" mode="widthFix"
:style="{width: (data.bgWidth - 30) +'px',height: data.bgWidth +'px' ,left: '15px'}"
style="position: absolute; z-index: 0; top: 0; bottom: 0; margin: auto;"></image>
-->
<!-- 底色 -->
<view :style="{width: data.editorWidth + 'px',height: data.editorHeight +'px',
background:background_color ? background_color : ''}"
style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto;z-index: 1;">
background:background_color ? background_color : '#F5F5F5' ,borderRadius: isShowCircular ? '50%' : '0' }"
style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto;z-index: 1; ;">
</view>
<!-- 遮罩图 -->
<image :src="data.bgImage" mode="widthFix"
<!-- <image :src="data.bgImage" mode="widthFix"
:style="{width: (data.bgWidth - 30 ) +'px',height: data.bgWidth +'px',left: '15px'}"
style="position: absolute; z-index: 2; top: 0; bottom: 0; margin: auto;"></image>
style="position: absolute; z-index: 2; top: 0; bottom: 0; margin: auto;"></image> -->
<!-- 辅助线 -->
<view v-if="guide_left"
style="border-left: 1px dashed #43cf7c;position: absolute; height: 100%; z-index: 999;"
......@@ -49,7 +51,7 @@
<!-- 主干 -->
<view :class="['item-list', { 'list-active': data.listActive == true }]"
style="opacity: 1;z-index: 1;"
:style="{width: data.editorWidth +'px',height: data.editorHeight +'px',top: editory +'px'}">
:style="{width: data.editorWidth +'px',height: data.editorHeight +'px',top: editory +'px',borderRadius: isShowCircular ? '50%' : '0' }">
<view
:style="{'margin-top': (editor_top - (data.editorHeight * mix_scale / 2)) +'px',width: data.editorWidth * mix_scale +'px',height: data.editorHeight * mix_scale +'px','mask-image':shape_image ? 'url(' + shape_image + ')' : 'none', '-webkit-mask-image':shape_image ? 'url(' + shape_image + ')' : 'none',}"
style="overflow: hidden; mask-size: 100%; -webkit-mask-size: 100%;margin-left:auto; margin-right: auto;mask-repeat:no-repeat;-webkit-mask-repeat: no-repeat;">
......@@ -166,7 +168,7 @@
:data-id='item.id' @touchstart="scaleStart($event, 'left-top')"
@touchend.stop.prevent='scaleEnd'>
<view v-if="item.support_zoom == 1" class='frame-left-top'
:style="{'border-left-color': item.typetext =='left-top' ? '#F56364' : '#5CE6B5', 'border-top-color': item.typetext =='left-top' ? '#F56364' : '#5CE6B5'}">
:style="{'border-left-color': item.typetext =='left-top' ? '#F56364' : '#F29F3D ', 'border-top-color': item.typetext =='left-top' ? '#F56364' : '#F29F3D'}">
</view>
</view>
<view v-if="item.activehorn" class='frame-right-top-wrap'
......@@ -174,7 +176,7 @@
:data-id='item.id' @touchstart="scaleStart($event, 'right-top')"
@touchend.stop.prevent='scaleEnd'>
<view v-if="item.support_zoom == 1" class='frame-right-top'
:style="{'border-right-color': item.typetext =='right-top' ? '#F56364' : '#5CE6B5', 'border-top-color': item.typetext =='right-top' ? '#F56364' : '#5CE6B5'}">
:style="{'border-right-color': item.typetext =='right-top' ? '#F56364' : '#F29F3D ', 'border-top-color': item.typetext =='right-top' ? '#F56364' : '#F29F3D'}">
</view>
</view>
<view v-if="item.activehorn" class='frame-left-bottom-wrap'
......@@ -182,7 +184,7 @@
:data-id='item.id' @touchstart="scaleStart($event, 'left-bottom')"
@touchend.stop.prevent='scaleEnd'>
<view v-if="item.support_zoom == 1" class='frame-left-bottom'
:style="{'border-left-color': item.typetext =='left-bottom' ? '#F56364' : '#5CE6B5', 'border-bottom-color': item.typetext =='left-bottom' ? '#F56364' : '#5CE6B5'}">
:style="{'border-left-color': item.typetext =='left-bottom' ? '#F56364' : '#F29F3D ', 'border-bottom-color': item.typetext =='left-bottom' ? '#F56364' : '#F29F3D'}">
</view>
</view>
<view v-if="item.activehorn" class='frame-right-bottom-wrap'
......@@ -190,7 +192,7 @@
:data-id='item.id' @touchstart="scaleStart($event, 'right-bottom')"
@touchend.stop.prevent='scaleEnd'>
<view v-if="item.support_zoom == 1" class='frame-right-bottom'
:style="{'border-right-color': item.typetext =='right-bottom' ? '#F56364' : '#5CE6B5', 'border-bottom-color': item.typetext =='right-bottom' ? '#F56364' : '#5CE6B5'}">
:style="{'border-right-color': item.typetext =='right-bottom' ? '#F56364' : '#F29F3D ', 'border-bottom-color': item.typetext =='right-bottom' ? '#F56364' : '#F29F3D'}">
</view>
</view>
<!-- 图片旋转 -->
......@@ -216,8 +218,6 @@
</view>
</view>
<!-- , maxWidth: data.editorWidth + 'px' -->
<!-- data.itemList[data.cidx].width -->
<!-- 计算字体大小 -->
<view class='item-box' style='top:-1000px;left:-1000px;'>
<!-- <view class='item-box' style='top:100px;left:100px;background: #007AFF;'> -->
......@@ -231,8 +231,9 @@
</view>
</view>
</view>
<!-- 上一步、下一步按钮 -->
<view class="operation" v-if="!active && !guide_left">
<view class="operation" v-if="!active && !guide_left" style="left: 120upx;">
<view class="operation_top">
<image @click.stop='prev' src="../../static/icon_back_enabled.png" mode="aspectFill"
style="width: 96upx; height: 96upx;"></image>
......@@ -242,12 +243,23 @@
style="width: 96upx; height: 96upx;"></image>
</view>
</view>
<!-- 切换商品 -->
<!-- <view :class="operation" v-if="!active && !guide_left" @click="changeGoods()"
style="display:flex;z-index: 99;position: fixed; left: 0; bottom:300upx; ">
<image src="../../static/icon_change_good.png" mode="aspectFill"
style="width: 84upx; height: 98upx;"></image>
</view> -->
<image @click="changeGoodSize()" mode="widthFix" src="../../static/icon_work_change_shap.png" style="
width: 90upx;
height: 106upx;
position: fixed;
top:200upx;
left:0upx;
z-index: 999;"></image>
<!-- display: flex;
justify-items: center;
align-items: center;
z-index: 99;
position: fixed;
bottom: 120upx;
left: 50%;
transform: translate(-50%, -50%); -->
<!-- 拖拽删除图库 -->
<view v-if="delete_wrap_state" class="delete-wrap" :class="{'delete-wrap-active':deleteWrap}"
......@@ -276,11 +288,8 @@
style="text-align: center; font-size: 28upx; font-weight: 500; color: #333333; line-height: 45upx; margin-top: 62upx;">
请选择手机拍摄或尺寸较大的图片<br>以体验最佳冲印效果
</view>
<!-- <view @click.stop='addItem' style="width: 466upx; height: 82upx; background: #F56364; border-radius: 10upx; font-size: 36upx;
font-weight: 400; color: #FFFFFF; text-align: center; line-height: 82upx; margin: 46upx auto 46upx; ">好的</view> -->
<view @click="selectPicturePop()" style="width: 466upx; height: 82upx; background: #F29F3D; border-radius: 10upx; font-size: 36upx; font-weight: 400;
color: #FFFFFF; text-align: center; line-height: 82upx; margin: 46upx auto 46upx; ">
好的</view>
color: #FFFFFF; text-align: center; line-height: 82upx; margin: 46upx auto 46upx; ">好的</view>
</view>
</view>
<!-- 上传进度条 -->
......@@ -301,10 +310,7 @@
<view class="tool_li_text">历史作品</view>
</view>
<view class="tool_li" @click="showPopup(23)">
<image class="tool_li_img" src="../../static/icon_diy_wallpaper.png" mode=""></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_text">贴图素材</view>
......@@ -333,12 +339,6 @@
<view class="tool_li_text">添加涂鸦</view>
</view>
<view class="tool_li" @click="wallpaperOnclick()" v-if="machine_id">
<image class="tool_li_img" style="width: 71upx; height: 59upx;"
src="../../static/randomwallpaper.png" mode=""></image>
<view class="tool_li_text">智能推荐</view>
</view>
<view class="tool_li" @click.stop="removedeleteItem" v-if="data.itemList.length > 0">
<image class="tool_li_img" style="width: 50upx; height: 50upx;"
src="../../static/diy_icon_middle_default.png" mode=""></image>
......@@ -352,12 +352,12 @@
<view class="tool_li_text">清空底色</view>
</view>
<image v-if="isShowGif && !guide_left" src="../../static/img/icon_finger_stretch.gif" style="width: 450upx; height: 450upx; left:calc(50% - 225upx); position: fixed;
<!-- <image v-if="isShowGif && !guide_left" src="../../static/img/icon_finger_stretch.gif" style="width: 450upx; height: 450upx; left:calc(50% - 225upx); position: fixed;
top: calc(50% - 225upx);
z-index: 1000;
display: flex;
align-items: center;" @click="oclikGifImage()" @touchstart="oclikGifImage()">
</image>
</image> -->
</view>
</view>
......@@ -391,11 +391,6 @@
:class="['tool_add',!machine_id ? 'grey' : '']">立即下单</view>
</view>
<!-- 单指可拖拽 -->
<view v-if="!guide_left "
style="position: fixed; font-size: 22upx; color: #999999; bottom: 280upx;left: 50%;transform: translate(-50%, 0%);z-index: 999; ">
<view>单指拖拽，双指伸缩</view>
</view>
<!-- 预览 -->
<view v-if="showtwo">
......@@ -429,7 +424,7 @@
</view>
</view>
<!-- 替换选项 -->
<uni-popup ref="replacebottom" type="bottom" @change="change">
<!-- <uni-popup ref="replacebottom" type="bottom" @change="change">
<view class="uni-share" style="width: 90%; margin: auto;">
<view style="background: #FFFFFF; border-radius: 20upx;">
<view
......@@ -440,7 +435,7 @@
style="height: 90rpx; line-height: 90rpx; font-size: 14px; text-align: center; color: #666; background: #FFFFFF; border-radius: 20upx; margin: 20upx 0;"
@click="cancel_replace()">取消</view>
</view>
</uni-popup>
</uni-popup> -->
<!-- 字体 -->
<uni-popup ref="textsettingsshare" type="bottom" @change="change" style="position: fixed; z-index: 9999;">
<view class="uni-share" style="width: 100%; height: 600upx;background: #292933;"
......@@ -572,7 +567,7 @@
</view>
</uni-popup>
<switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem"></switchGoods>
<switchGoods ref="switchGoods" @selectGoodItem="selectGoodSizeItem"></switchGoods>
<!--商品弹框 -->
</view>
......@@ -663,7 +658,6 @@
/* 控制被选中 */
currentIndex_wallpaper: null,
/* 控制位置 */
material_series_currentId: null,
/* 控制位置 */
......@@ -756,15 +750,13 @@
shape_price: '', //形状价格
goods_images_type: 0,
front_image_long: false, //背景图加载完
// 拖拽删除
//拖拽删除
animationData: {},
animation: null,
deleteTop: 0,
deleteWrap: false,
delete_wrap_state: true,
background_color: null,
translateX: -400,
translateXState: 1,
translateLeft: null,
......@@ -782,6 +774,9 @@
material_series_list: [], //系列分类
material_series_currentId: 0,
isShowGif: false, //是否显示
isShowCircular: false, //是否圆形
real_width: "", //尺寸大小
goods_size_name: "", //尺寸名字
};
},
......@@ -794,6 +789,19 @@
methods: {
//切换形状
changeGoodSize() {
this.$refs['switchGoods'].open(this.machine_id);
},
//选择型号
selectGoodSizeItem(item) {
this.data.goods_id = item.id;
this.titlename = item.title;
this.goods_size_name = item.title;
this.real_width = item.key;
this.goodslist();
},
//点击显示动画
oclikGifImage() {
......@@ -863,7 +871,6 @@
this.saveSnapshot();
},
//切换商品
changeGoods() {
this.$refs['switchGoods'].open(this.machine_id);
......@@ -1001,184 +1008,8 @@
drawImg(e, res) {
this.showtwo = true
},
//解决滚动穿透问题
// myCatchTouch() {
// return
// },
// 替换图片
// addItemreplace() {
// this.replaceimage()
// },
replaceimage() {
this.$refs['replacebottom'].close()
let item = items[index];
var _this = this
uni.chooseImage({
sizeType: ['original'], //可以指定是original原图还是compressed压缩图，默认二者都有
sourceType: ['camera', 'album'], //从相册选择
count: 1,
success: (res) => {
let tempFilePaths = res.tempFilePaths;
var size = res.tempFiles[0].size;
var path = res.tempFiles[0].path;
var formatImage = path.split(".")[(path.split(".")).length - 1];
if (formatImage != "png" && formatImage != "jpg" && formatImage != "jpeg") {
return wx.showToast({
title: '只能上传.png、.jpg、.jpep 格式',
icon: 'none',
image: '',
duration: 2000,
mask: true,
})
}
let machine_id = _this.machine_id || 0
let user_id = userService.getUserInfo().id || 0
wx.request({
url: _this.$Env.getDevBaseURL() + '/api/AliossSign/getSign?machine_id=' +
machine_id + '&user_id=' + user_id,
method: 'GET',
data: '',
header: {
'content-type': 'application/x-www-form-urlencoded',
'Accept': 'application/json'
},
success: function(res) {
//这里是进度条
_this.percent = 0
var atter = res.data
let time = new Date().getTime() + Math.floor((Math.random() *
1000) + 1)
var uploadTask = wx.uploadFile({
url: atter.host.replace("http:", "https:"),
filePath: tempFilePaths[0],
name: 'file',
formData: {
'key': atter.dir + time + '.jpg',
'OSSAccessKeyId': atter.accessid,
'policy': atter.policy,
'Signature': atter.signature,
'success_action_status': '200',
'callback': atter.callback,
},
success: function(res) {
if (res.statusCode != 200) {
// console.log({errCode: '599', msg:'其他错误'})
return;
}
if (res.statusCode == 200) {
_this.percent = 100
uni.showToast({
title: '上传成功',
icon: 'none',
duration: 3000
})
// console.log(atter.host + '/' + atter.dir + time + '.jpg')
uni.getImageInfo({
src: tempFilePaths[0],
success: (image) => {
// 替换图片的算法：
// 图片的宽为W1，高为 H1 , 图片宽高比为： R1 = W1/H1
// 外框的宽为W2，高为 H2 , 外框宽高比为： R2 = W2/H2
// 当R1 > R2, 放入的图片宽度要适应外框的宽W2, 图片高度需要裁剪
// 当R1 < R2, 放入的图片宽度要适应外框的高H2, 图片宽度需要裁剪
let W1 = item.width
let H1 = item.height
let W2 = image.width
let H2 = image.height
let R1 = W1 / H1
let R2 = W2 / H2
// 替换图片，初始值
item.image_left = 0
item.image_top = 0
item.initialScale = 1
item.initialscaling = 1
item.initialScalex = 1
item.initialScaley = 1
if (R1 > R2) {
item.replace = 1
item.content =
atter.host +
'/' + atter
.dir + time +
'.jpg'
item.initialWidth =
item.width
item.initialHeight =
W1 / W2 * image
.height
item.image_top = -(
W1 / W2 *
image
.height -
H1) / 2
} else if (R1 < R2) {
item.replace = 1
item.content =
atter.host +
'/' + atter
.dir + time +
'.jpg'
item.initialHeight =
item.height
item.initialWidth =
H1 / H2 * image
.width
item.image_left = -
(H1 / H2 *
image
.width - W1
) / 2
} else {
item.content =
atter.host +
'/' + atter
.dir + time +
'.jpg'
}
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
}
} else {
item.original_id =
0
item.material_id =
0
}
}
});
}
},
fail: function(err) {
wx.showToast({
title: '上传失败！',
icon: 'none',
duration: 1200
})
},
complete: function(err) {
}
})
uploadTask.onProgressUpdate((res) => {
_this.percent = res.progress - 1
})
}
})
}
})
},
/* 上传图片 */
addItem: async function(e) {
this.showone = false
......@@ -1206,6 +1037,7 @@
}
})
},
/* 上传图片拍照 */
addItemFromCamera: async function(e) {
this.showone = false
......@@ -1367,39 +1199,11 @@
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)
// height = _this.editor_top * 2
// }
// console.log(_this.mix_scale)
// if (ratio >= 1) { //长方形
//width = _this.data.editorWidth * _this.mix_scale
//height = image.height * ratiowidth
// if (height / 2 > _this.editor_top) {
// width = width * (_this.editor_top * 2 / height)
// height = _this.editor_top * 2
// }
// console.log(width)
// } else if (ratio < 1) { //窄高方形
// height = _this.data.editorHeight * _this.mix_scale
// width = image.width * ratioheight
// if (height / 2 > _this.editor_top) {
// width = width * (_this.editor_top * 2 / height)
// height = _this.editor_top * 2
// }
// }
_this.isShowGif = true;
let index = items.length;
items.push({
......@@ -1581,7 +1385,7 @@
}, 1500);
}
},
// 创建订单
//创建订单
createWorks_one(e) {
let pixelRate = this.data.pixelRate;
let components = [];
......@@ -1593,23 +1397,32 @@
// 循环当前的组件数据
for (var item of this.data.itemList) {
item.rotate = item.angle
width = (item.width * item.scale) / pixelRate;
height = (item.height * item.scale) / pixelRate;
if (item.scale == 1) {
scalePos = this.calNoScalePos(item.left, item.top, item.width, item.height);
left = item.left / pixelRate;
top = item.top / pixelRate;
} else {
scalePos = this.calScalePos(item.scale, item.left, item.top, item.width, item.height);
left = scalePos.leftTopX / pixelRate;
top = scalePos.leftTopY / pixelRate;
width = (item.width * item.scale);
height = (item.height * item.scale);
scalePos = this.calNoScalePos(item.left, item.top, item.width, item.height);
left = item.left;
top = item.top;
item.centerPos = {
x: item.left + width / 2,
y: item.top + height / 2
}
if (item.rotate != 0) {
item.x = item.centerPos.x;
item.y = item.centerPos.y;
if (item.angle != 0) {
scalePos = this.calRocatePos(scalePos, {
x: item.x,
y: item.y
}, item.rotate);
}, item.angle);
}
let widScale = pixelRate * this.design_widthrate / (this.real_width / 150); //宽度比例
let heiScale = pixelRate * this.design_heightrate / (this.real_width / 150); //高度比例
var comlist = {
support_zoom: item.support_zoom, // 0是不支持缩放，为1时支持缩放
support_drag: item.support_drag, // 0是不支持拖动，为1时支持拖动
......@@ -1623,44 +1436,42 @@
index: item.index,
font_family: item.font_family + '.ttf',
font_dict_id: item.font_dict_id,
// font_style: item.font_style == "normal" ? "regular" : "bold",
font_style: "regular",
font_size: item.font_size / pixelRate / this.design_widthrate,
font_size: item.font_size / widScale,
font_color: item.font_color,
under_color: item.under_color ? item.under_color : "#00000000",
width: width / this.design_widthrate,
height: height / this.design_heightrate,
top: top / this.design_heightrate,
left: left / this.design_widthrate,
width: width / widScale,
height: height / heiScale,
top: top / heiScale,
left: left / widScale,
zoom: item.scale,
rotate: item.rotate,
content: item.content,
upper_left_x: scalePos.leftTopX / pixelRate / this.design_widthrate,
upper_left_y: scalePos.leftTopY / pixelRate / this.design_heightrate,
upper_right_x: scalePos.rightTopX / pixelRate / this.design_widthrate,
upper_right_y: scalePos.rightTopY / pixelRate / this.design_heightrate,
lower_left_x: scalePos.leftBottomX / pixelRate / this.design_widthrate,
lower_left_y: scalePos.leftBottomY / pixelRate / this.design_heightrate,
lower_right_x: scalePos.rightBottomX / pixelRate / this.design_widthrate,
lower_right_y: scalePos.rightBottomY / pixelRate / this.design_heightrate,
center_x: item.x / pixelRate / this.design_widthrate,
center_y: item.y / pixelRate / this.design_heightrate,
upper_left_x: scalePos.leftTopX / widScale,
upper_left_y: scalePos.leftTopY / heiScale,
upper_right_x: scalePos.rightTopX / widScale,
upper_right_y: scalePos.rightTopY / heiScale,
lower_left_x: scalePos.leftBottomX / widScale,
lower_left_y: scalePos.leftBottomY / heiScale,
lower_right_x: scalePos.rightBottomX / widScale,
lower_right_y: scalePos.rightBottomY / heiScale,
center_x: item.x / widScale,
center_y: item.y / heiScale,
}
// type: 0, //0为图片，1为文字，2为素材
if (item.type == 0) {
// 新添加的参数
comlist.image_left = item.image_left ? (item.image_left + item.left) / pixelRate / this
.design_widthrate : (left / this.design_widthrate) // 图片的x
comlist.image_top = item.image_top ? (item.image_top + item.top) / pixelRate / this
.design_heightrate : (top / this.design_heightrate) // 图片的y
comlist.image_width = item.initialWidth * item.initialScale / pixelRate / this
.design_widthrate // 图片宽度
comlist.image_height = item.initialHeight * item.initialScale / pixelRate / this
.design_heightrate // 图片高度
if (item.isFillet) {
comlist.has_corner = 1;
} else {
comlist.has_corner = 0;
}
//新添加的参数
comlist.image_left = item.image_left ? (item.image_left + item.left) / widScale : (left /widScale) // 图片的x
comlist.image_top = item.image_top ? (item.image_top + item.top) / heiScale : (top /heiScale) // 图片的y
comlist.image_width = item.initialWidth * item.initialScale / widScale // 图片宽度
comlist.image_height = item.initialHeight * item.initialScale / heiScale // 图片高度
}
// 创建组件数据
//创建组件数据
components.push(comlist);
this.Workcomponents = components
}
if (this.data.works_idlenght == 0 && this.works_id == null) {
this.data.template = null //源作品id
......@@ -1684,7 +1495,7 @@
})
homeservice.cheshi({
s: 'Works.save',
components: this.Workcomponents,
components: components,
works_id: this.works_id,
goods_id: this.data.goods_id,
template: this.data.template, //源作品id
......@@ -1697,6 +1508,9 @@
shape_price: this.shape_price, //形状价格
machine_id: this.machine_id, //设备idmachine_id
background_color: this.background_color, //手机壳背景颜色
is_general: "1",
real_width: this.real_width,
real_height: this.real_width,
}).then(result => {
uni.hideLoading();
uni.showToast({
......@@ -1711,16 +1525,7 @@
goods_images_type: 0, //0 主图，1 副图
})
this.goods_images_type = 0
/*if(this.support_pay == 1){
uni.navigateTo({
url: '../mine/order?goodid=' + result.id +
'&machine_id=' + this.machine_id +
'&goods_id=' + this.data.goods_id +
'&sn=' + this.sn
})
}else{ */
this.self_help(this.loading, result.id)
/* } */
}).catch(err => {
uni.hideLoading();
this.loading = false;
......@@ -1748,7 +1553,8 @@
sn: null, //前端查询标志
coupon_id: null, //优惠券id，支付多个id( 1-2-3)
user_address: null, //收货地址
goods_images_type: this.goods_images_type
goods_images_type: this.goods_images_type,
goods_size: this.goods_size_name,
}
uni.showLoading({
title: '正在生成订单...',
......@@ -1824,15 +1630,7 @@
}
// 记录坐标
item.scaleone = item.width / item.height
// item.initRightBottomPoint = item.rightBottomPoint
// item.initRightTopPoint = item.rightTopPoint
// item.initLeftTopPoint = item.leftTopPoint
// item.initLeftBottomPoint = item.leftBottomPoint
// item.initLeftMiddlePoint = item.leftMiddlePoint
// item.initRightMiddlePoint = item.rightMiddlePoint
// item.initTopMiddlePoint = item.topMiddlePoint
// item.initBottomMiddlePoint = item.bottomMiddlePoint
// item.initCenterPos = item.centerPos
// 获取编辑框的左边距和上边距
var mLeft = this.getLeft();
var mTop = this.getTop();
......@@ -2036,7 +1834,6 @@
snapshot = []; // 操作历史记录清空
snapshotIndex = -1;
}
uni.hideLoading()
let index = items.length;
let width = 0
......@@ -2045,8 +1842,7 @@
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
let ratioheight = (this.data.editorHeight * this.mix_scale) / image.height
let resultmix_scale = result.mix_scale || 1
// if (ratio >= 1) { //长方形
width = this.data.editorWidth * this.mix_scale * resultmix_scale
......@@ -2113,7 +1909,7 @@
frame_top: null, // 裁剪窗口y
image_top: null, // 图片y
})
// 提示用户此贴图可用卷
if (result.is_discount == '1') {
if (this.$base.coupon_flag_desc == '') return;
......@@ -2145,36 +1941,7 @@
});
},
isLeft(flag = null) {
// uni.showLoading({
// title: '正在加载中...'
// })
// homeservice.WorksList(this.queryPage).then(result => {
// if (this.e_active == 1) {
// this.Works_categorydatalist = this.Works_categorydatalist.concat(result.data)
// this.datalist = this.datalist.concat(result.data)
// } else if (this.e_active == 2) {
// this.Material_categorydatalist = this.Material_categorydatalist.concat(result.data)
// this.datalist = this.datalist.concat(result.data)
// }
// this.queryPage.page += 1;
// if (flag == 'more') {
// if (Math.ceil(result.total / result.per_page) <= this.queryPage.page) {
// return setTimeout(() => {
// uni.showToast({
// title: '没有更多数据了！',
// icon: 'none'
// });
// }, 500);
// }
// }
// uni.hideLoading();
// }).catch(err => {
// uni.showToast({
// title: err.msg,
// icon: 'none'
// })
// uni.hideLoading();
// });
},
bgColorAssembly(bg) {
this.background_color = bg
......@@ -2197,7 +1964,6 @@
}
},
////打开弹框 1模板 2贴图 3字体 4编辑 22添加相框 23壁纸
material_series_handleScroll(index, item) {
this.queryPage.page = 1
......@@ -2228,24 +1994,7 @@
this.mapping_material_series_currentId = 0;
}
if (this.e_active == 1) {
// this.currentId_Works = index;
// this.currentIndex_Works = Math.max(0, index - 1);
// this.Works_categorydatalist = []
// this.queryPage.page = 1
// this.Works_category_id = item.id
// if (this.brands[this.currentId_Works].title == '热门') {
// this.queryPage.is_hot = 1
// this.queryPage.is_new = null
// this.queryPage.works_category_id = null
// } else if (this.brands[this.currentId_Works].title == '最新') {
// this.queryPage.is_new = 1
// this.queryPage.is_hot = null
// this.queryPage.works_category_id = null
// } else {
// this.queryPage.is_hot = null
// this.queryPage.is_new = null
// this.queryPage.works_category_id = item.id
// }
} else if (this.e_active == 2) { //贴图
this.currentId_Material = index;
this.currentIndex_Material = Math.max(0, index - 1);
......@@ -2568,156 +2317,6 @@
}
},
//打开弹框 1模板 2贴图 3字体
/*showPopup(e) {
this.delete_wrap_state = false
this.showone = false
this.e_active = e
this.togglePopup('bottom', 'share')
this.$refs['textsettingsshare'].close()
this.queryPage.page = 1
if (e == 1) { //模板
} else if (e == 2) { //贴图
this.backgroundColor = false
this.Adlists = this.diy_bannerList
this.queryPage.goods_id = null;
this.brands = this.Material_category
this.currentId = this.currentId_Material;
this.currentIndex = this.currentIndex_Material;
this.queryPage.s = 'Material.list'
this.queryPage.works_category_id = null
this.queryPage.material_category_id = null
if (this.brands[this.currentId].title == '热门') {
this.queryPage.is_hot = 1
this.queryPage.is_new = null
} else if (this.brands[this.currentId].title == '最新') {
this.queryPage.is_new = 1
this.queryPage.is_hot = null
} else {
this.queryPage.is_hot = null
this.queryPage.is_new = null
this.queryPage.material_category_id = this.Material_category[0].id
if (this.Material_category_id) {
this.queryPage.material_category_id = this.Material_category_id
}
}
this.MaterialseriesList()
this.$nextTick(() => {
this.$refs['scrollList'].open({
e: e,
queryPage: this.queryPage,
})
})
} else if (e == 3) { //文本
index = null
this.addtext = true
this.data.currentText = ''
this.$nextTick(() => {
this.$refs['textsettings'].open({
data: this.data,
bg_text_color: this.bg_text_color
})
})
} else if (e == 4) {
this.addtext = false
this.$nextTick(() => {
this.$refs['textsettings'].open({
data: this.data,
bg_text_color: this.bg_text_color
})
})
} else if (e == 22) { //形状
this.queryPage.goods_id = this.data.goods_id
this.brands = this.Works_category
this.currentId = this.currentId_Works;
this.currentIndex = this.currentIndex_Works;
this.queryPage.s = 'Material.getShapeList'
this.queryPage.material_category_id = null
this.queryPage.works_category_id = null
this.queryPage.shape_category_id = null
this.queryPage.is_hot = null
this.queryPage.is_new = null
this.queryPage.shape_category_id = this.Works_category[0].id
if (this.Works_category_id) {
this.queryPage.shape_category_id = this.Works_category_id
}
this.$nextTick(() => {
this.$refs['shapeScrollView'].open(this.queryPage)
})
} else if (e == 23) { //壁纸
this.Adlists = this.diy_backList
this.queryPage.goods_id = this.data.goods_id
this.brands = this.wallpaper_category //壁纸分类
this.currentId = this.currentId_wallpaper; /* 控制被选中 */
/* this.currentIndex = this.currentIndex_wallpaper; /* 控制位置 */
/* this.queryPage.s = 'Material.list'
this.queryPage.works_category_id = null
this.queryPage.material_category_id = null
if (this.brands[this.currentId].title == '热门') {
this.queryPage.is_hot = '1'
this.queryPage.is_new = null
} else if (this.brands[this.currentId].title == '最新') {
this.queryPage.is_new = '1'
this.queryPage.is_hot = null
} else {
this.queryPage.is_hot = null
this.queryPage.is_new = null
this.queryPage.material_category_id = this.wallpaper_category[0].id
if (this.wallpaper_category_id) {
this.queryPage.material_category_id = this.wallpaper_category_id
}
}
this.MaterialseriesList()
this.$nextTick(() => {
this.$refs['scrollList'].open({
e: e,
queryPage: this.queryPage,
})
})
} else if (e == 25) {
this.Adlists = this.diy_bannerList
this.queryPage.goods_id = null
this.brands = this.Material_category
this.currentId = this.currentId_Material;
this.currentIndex = this.currentIndex_Material;
this.queryPage.s = 'Material.list'
this.queryPage.works_category_id = null
this.queryPage.material_category_id = null
if (this.brands[this.currentId].title == '热门') {
this.queryPage.is_hot = 1
this.queryPage.is_new = null
} else if (this.brands[this.currentId].title == '最新') {
this.queryPage.is_new = 1
this.queryPage.is_hot = null
} else {
this.queryPage.is_hot = null
this.queryPage.is_new = null
this.queryPage.material_category_id = this.Material_category[0].id
if (this.Material_category_id) {
this.queryPage.material_category_id = this.Material_category_id
}
}
this.MaterialseriesList()
this.e_active = 2
this.queryPage.page = 1
this.backgroundColor = true
this.$nextTick(() => {
this.$refs['bgColor'].open()
})
} else if (e == 28) {
this.Adlists = this.diy_backList
this.backgroundColor = true
this.$nextTick(() => {
setTimeout(function() {
this.$refs['bgColor'].open()
}.bind(this), 200)
})
}
}, */
cancel(type) { //关闭弹框
this.isShowGif = false;
try {
......@@ -3182,7 +2781,7 @@
if (item.type == 1) {
currentText = item.content;
}
item.mLeft = item.left;
item.mTop = item.top;
drag.recordPressDownData(item);
......@@ -3430,9 +3029,7 @@
item.activehorn = 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();
},
/* 部件旋转结束事件*/
......@@ -3441,7 +3038,6 @@
var item = items[index];
item.typetext = null;
//赋值
// this.data.listActive = false
//关闭点击属性
item.active = true //辅助线
item.activeguide = false // 辅助线状态
......@@ -3490,8 +3086,6 @@
},
// 移除图片
removedeleteItem(item, ix) {
//this.active = false;
//this.guide_left = false
if (!this.active) {
index = items.length - 1
items.splice(index, 1); // 删除指定的部件
......@@ -3610,9 +3204,7 @@
var width = res[0].width;
var rate = item.width / width;
var tmpSize = item.font_size * rate;
/* console.log("tmpSizewidth=" + width + "item.width=" + item.width + "diyWidth=" + that.data
.editorWidth) */
//console.log("输入tmpSize大小=" + tmpSize)
if (tmpSize > maxFontSize) {
item.font_size = maxFontSize;
item.height = maxFontSize * heightRate;
......@@ -3646,40 +3238,19 @@
var query = wx.createSelectorQuery();
query.select('#item-text').boundingClientRect();
query.exec(function(res) {
console.log(res)
var width = res[0].width;
var rate = item.width / width;
/* console.log(res)
console.log("输入tmpSizewidth=" + width + "item.width=" + item.width + "diyWidth=" + that
.data.editorWidth)*/
var tmpSize = item.font_size * rate;
/* console.log("输入tmpSize大小=" + tmpSize) */
if (tmpSize > maxFontSize) {
item.font_size = maxFontSize;
item.height = maxFontSize * heightRate;
item.top = item.y - (item.height / 2);
/* } else if (tmpSize < 11) { //判断字体小于10等于10
let differWid = 0;
if (width > item.width) {
differWid = width - item.width;
var fontSize = 10 - differWid / 10;
item.font_size = fontSize;
item.height = fontSize * heightRate;
item.top = item.y - (item.height / 2);
} else {
item.font_size = 9;
item.height = 9 * heightRate;
item.top = item.y - (item.height / 2);
} */
} else {
item.font_size = item.font_size * rate;
item.height = item.height * rate;
item.top = item.y - (item.height / 2);
}
// that.setData({itemList:items});
that.setData({
data: that.data
......@@ -3767,8 +3338,12 @@
s: 'Product.detail',
id: this.data.goods_id
}).then(result => {
this.titlename = result.name //修改头部名称
if (result.feature == "圆形") {
this.isShowCircular = true;
} else {
this.isShowCircular = false;
}
this.titlename = result.name + " " + this.titlename //修改头部名称
//读取背景图
uni.getImageInfo({
src: result.front_image_old,
......@@ -3789,12 +3364,12 @@
}
})
//console.log("this.data.bgHeight=" + this.data.bgHeight);
this.data.bgImage = result.front_image // 背景图
this.data.bgImage_old = result.front_image_old // 旧背景图
//this.data.bgImage_old = result.front_image;
this.data.bgImage_thumbnail = result.thumbnail // 介绍图片（主图遮罩）
this.design_color = result.design_color // 背景颜色
this.mix_scale = result.mix_scale //上传图片比率
this.design_height = result.design_height // 设计高度
this.design_width = result.design_width // 设计宽度
......@@ -3850,34 +3425,6 @@
icon: 'none'
});
});
/* homeservice.queryList({
s: 'Material.getShapeCategory',
'machine_id': this.machine_id || null
}).then(result => {
this.Works_category = result
}).catch(err => {
uni.showToast({
title: err.msg,
icon: 'none'
})
});
homeservice.queryList({
s: 'Material.category',
'machine_id': this.machine_id || null
}).then(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: "最新"
}, )
}).catch(err => {
uni.showToast({
title: err.msg,
icon: 'none'
})
}); */
},
......@@ -3897,11 +3444,11 @@
itemTouchCancel: infoListTouchEvent.cancel.bind(infoListTouchEvent)
},
onLoad(options) {
// machine_id=100036&key=2
// console.log(options)
items = []
this.titlename = options.title
this.goods_size_name = options.title;
this.real_width = options.real_width
this.data.goods_id = options.good_id;
//console.log("this.data.goods_id="+options.good_id)
let that = this;
wx.createSelectorQuery().select('.delete-wrap').boundingClientRect(function(rect) {
if (rect != null) {
......@@ -3930,8 +3477,7 @@
} else {
that.isShowGif = false;
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 < 300) { //是双击事件
if (items[index].type == 0) {
......@@ -3982,9 +3528,7 @@
}
},
touchCancel: function(e) {
that.isShowGif = false;
that.$refs['textsettingsshare'].close()
if (items.length > 0) {
let item = items[index];
......@@ -4002,7 +3546,6 @@
animationData: that.animation.export()
})
}
}.bind(this),
rotate: function(e) { //双指缩放
let item = items[index];
......@@ -4036,7 +3579,6 @@
}
}
})
//console.log("machine_id="+options.machine_id);
//获取屏幕宽高
wx.getSystemInfo({
success: function(res) {
......@@ -4046,13 +3588,10 @@
that.data.bgWidth = res.windowWidth // 画布宽度
that.data.bgHeight = res.windowHeight // (861 / 1196) // 画布高度 高度比率 * (861 / 1196)
that.data.pixelRate = pixelRate // 屏幕宽度比率
//if(options.machine_id != undefined) { // 判断是从设备进来
that.machine_id = options.machine_id || null // 设备id
that.queryPage.machine_id = options.machine_id || null // 设备id
//that.data.goods_id = 100 // 商品id
that.key = 2
that.goodslist() // 获取产品详情数据
//}
that.category() // 作品分类 贴图分类
}
})
......
pages/index/machineDetail.vue
......@@ -21,21 +21,16 @@
style="width: 15upx; height: 15upx; margin-left: 10upx;"></image>
<image else src="../../static/icon_banner_select_dot.png"
style="width: 15upx; height: 15upx; margin-left: 10upx;"></image>
<!-- <view class="dot iconfont"
:class="[index == currentSwiper ? 'iconsanjiaoxing':'iconxingzhuang-sanjiaoxing' ]">
</view> -->
</view>
</view>
</view>
<view @click="Customize_now" hover-class="hover-class-bg" style="position: fixed; bottom: 130upx; left: 0; right: 0; margin: auto;
width: 300upx; height: 100upx;
background: linear-gradient(92deg, #F29F3D, #67C4CA);
background: linear-gradient(92deg, #E6B01A, #F29F3D);
box-shadow: 0px 19px 48px 1px rgba(20, 31, 62, 0.35);
border-radius: 40px;">
<view
style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">
立即定制</view>
<view style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">立即定制</view>
</view>
</view>
......@@ -66,7 +61,7 @@
<Signin ref="Signin"></Signin>
<view v-if="statusloading == 1" @tap="toLineList"
style="position: fixed; z-index: 99; right: 0; bottom: 200upx; width: 109upx; height: 123upx;">
style="position: fixed; z-index: 99; right: 0; bottom: 300upx; width: 109upx; height: 123upx;">
<image src="../../static/liebiao.png" mode="" style="width: 243upx; height: 123upx;"></image>
</view>
......@@ -126,9 +121,11 @@
//选择商品进来
selectGoodItem(item) {
uni.navigateTo({
url: '../index/index?machine_id=' + this.machine_id + "&good_id=" + item.id,
url: '../index/index?machine_id=' + this.machine_id + "&good_id=" + item.id + "&title=" + item.title + "&real_width=" + item.key,
})
},
//立即定制
......@@ -170,12 +167,12 @@
uni.login({
provider: 'weixin',
success: (res) => {
//console.log(res)
userService.login({
s: 'Init.init',
code: res.code
}).then(r => {
that.getDetail();
//console.log("进来")
//that.getDetail();
if (type == 1) {
that.$refs['switchGoods'].open(that.machine_id);
} else {
......@@ -281,6 +278,7 @@
this.$base.machine_id = this.machine_id
this.statusloading = 1;
this.Adlist() // 轮播图
//this.getDetail();
},
onShow() {},
......
pages/index/mall.vue
<template>
<view class="full-width full-height">
<!-- v-if="system_config.golf_diy.value == 0" -->
<!-- v-if="system_config.golf_diy.value == 0" -->
<view v-if="system_config.lite_diy.value == 0" @tap="doubleTap" @touchstart="touchStart" @touchend="touchEnd"
<view v-if="system_config.baking_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: #43cf7c; border-radius: 44upx 0px 0px 44upx;">
width: 100upx; height: 88upx; background: #F29F3D; border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>定制</view>
<view>体验</view>
</view>
</view>
<!-- 无设备 -->
<view style="display: flex; justify-content: center;" :style="{height: 'calc(100% - ' + titleHeight +'px)'}">
<view style="margin-top: 231upx;">
......@@ -18,16 +17,17 @@
<view class="start_title" style="margin-top: 120upx;">定制站必须扫码才能使用</view>
</view>
</view>
<!-- 扫码定制 -->
<view @click="scanning" style="width: 460upx; position: fixed; bottom: 180upx; margin: auto;
height: 164upx; background: #FAD9B1 ; left: 0; right: 0; z-index: 99; border-radius: 20upx;
height: 164upx; background: #F5DFA4 ;left: 0; right: 0; z-index: 99; border-radius: 20upx;
display: flex; align-items: center;">
<view style="background: #FFFFFF;width: 120upx;
height: 120upx;border-radius: 50%; margin: 22upx 30upx;text-align: center;">
<image style="height: 61upx; width: 61upx;margin:32upx auto;" src="../../static/icon_saoyisao.png" mode=""></image>
<image style="height: 61upx; width: 61upx;margin:32upx auto;" src="../../static/icon_saoyisao.png"
mode=""></image>
</view>
<view style="color: #333333 ; font-weight: bold;font-size: 33upx;">开始扫码定制</view>
<view style="color: #333333 ; font-weight: bold;font-size: 34upx;">开始扫码定制</view>
</view>
<!-- 登录弹框 -->
<Signin ref="Signin"></Signin>
......@@ -57,100 +57,7 @@
};
},
methods: {
// Uploadpictures(){
// var that = this
// wx.chooseMessageFile({
// count: 1,
// type: 'image',
// success(res) {
// console.log(res);
// // tempFilePath可以作为img标签的src属性显示图片
// let tempFilePaths = [];
// res.tempFiles.forEach(item => {
// tempFilePaths.push(item.path)
// })
// var size = res.tempFiles[0].size;
// var path = res.tempFiles[0].path;
// var formatImage = path.split(".")[(path.split(".")).length - 1];
// if (formatImage != "png" && formatImage != "jpg" && formatImage != "jpeg") {
// return wx.showToast({
// title: '只能上传.png、.jpg、.jpep 格式',
// icon: 'none',
// image: '',
// duration: 2000,
// mask: true,
// })
// }
// that.uploadDIY(tempFilePaths, 0, 0, 0, tempFilePaths.length);
// }
// })
// },
/* 函数描述：作为上传文件时递归上传的函数体体；
* 参数描述：
* filePaths是文件路径数组
* successUp是成功上传的个数->0
* failUp是上传失败的个数->0
* i是文件路径数组的指标->0
* length是文件路径数组的长度
* machine_id=user_id=
*/
// uploadDIY(tempFilePaths, successUp, failUp, i, length) {
// let machine_id = this.machine_id || 0
// let user_id = userService.getUserInfo().id || 0
// var _this = this
// wx.request({
// url: this.$Env.getDevBaseURL() + '/api/AliossSign/getSign?machine_id=' + machine_id + '&user_id=' + user_id,
// method: 'GET',
// data:'',
// header: {
// 'content-type':'application/x-www-form-urlencoded',
// 'Accept': 'application/json'
// },
// success: function (res) {
// //这里是进度条
// _this.percent = 0
// var atter = res.data
// let time = new Date().getTime() + Math.floor((Math.random() * 1000) + 1)
// var uploadTask = wx.uploadFile({
// url: atter.host.replace("http:", "https:"),
// filePath: tempFilePaths[i],
// name: 'file',
// formData: {
// 'key': atter.dir + time + '.jpg',
// 'OSSAccessKeyId': atter.accessid,
// 'policy': atter.policy,
// 'Signature': atter.signature,
// 'success_action_status': '200',
// 'callback':atter.callback,
// },
// success: function(res) {
// successUp++;
// if (res.statusCode != 200) {
// // console.log({errCode: '599', msg:'其他错误'})
// return;
// }
// if (res.statusCode == 200){
// _this.percent = 100
// uni.showToast({ title: '上传成功', icon: 'none',duration: 3000 })
// console.log(atter.host + '/' + atter.dir + time + '.jpg')
// }
// },
// fail: function(err) {
// failUp++;
// wx.showToast({title: '上传失败！',icon: 'none',duration: 1200})
// },
// complete: function(err) {
// console.log('总共' + successUp + '张上传成功,' + failUp + '张上传失败！');
// }
// })
// uploadTask.onProgressUpdate((res) => {
// console.log('上传进度', res.progress + " " + new Date())
// console.log('已经上传的数据长度', res.totalBytesSent)
// console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
// })
// }
// })
// },
getQueryString(url, name) {
var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
var r = url.substr(1).match(reg)
......@@ -159,6 +66,7 @@
}
return null;
},
scanning() {
if (!this.$AppContext.checkLogin()) {
this.tologo('navigateTo')
......@@ -173,10 +81,11 @@
success: function(res) {
console.log(res)
if (res.scanType == 'QR_CODE') {
if (that.getQueryString(res.result, 'machine_id')) {
if (that.getQueryString(res.result, 'machine_id') && that.getQueryString(res.path, 'machine_id') != "" && that.getQueryString(res.result, 'machine_id') != null && that.getQueryString(res.result,'machine_id') != "null") {
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + that.getQueryString(
res.result, 'machine_id')
url: '../index/machineDetail?machine_id=' + that
.getQueryString(
res.result, 'machine_id')
});
} else {
uni.showToast({
......@@ -187,7 +96,8 @@
}
} else {
if (res.path) {
if (that.getQueryString(res.path, 'machine_id')) {
if (that.getQueryString(res.path, 'machine_id') && that.getQueryString(res.path, 'machine_id') != "" && that.getQueryString(res
.result, 'machine_id') != null && that.getQueryString(res.result,'machine_id') != "null") {
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + that
.getQueryString(res.path, 'machine_id')
......@@ -214,7 +124,7 @@
});
}
},
// 防止重复点击
//防止重复点击
touchStart(e) {
this.touchStartTime = e.timeStamp;
},
......@@ -222,7 +132,6 @@
this.touchEndTime = e.timeStamp;
},
doubleTap(e) {
//console.log("doubleTap=");
// 控制点击事件在350ms内触发，加这层判断是为了防止长按时会触发点击事件
if (this.touchEndTime - this.touchStartTime < 350) {
// 当前点击的时间
......@@ -235,13 +144,11 @@
if (!this.$AppContext.checkLogin()) {
this.tologo('navigateTo')
} else {
//console.log("进来=");
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + this.$Env.getmachineId()
});
//uni.navigateTo({
// url: '../index/index',
//})
if (this.$Env.getmachineId() && this.$Env.getmachineId() != "") {
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + this.$Env.getmachineId()
});
}
}
}
}
......@@ -259,8 +166,7 @@
}).then(r => {
if (e == 'navigateTo') {
uni.navigateTo({
url: '../mall/machineDetail?machine_id=' + that.$Env
.getmachineId() + '&worksid=0'
url: '../mall/machineDetail?machine_id=' + that.$Env.getmachineId() + '&worksid=0'
});
}
}).catch(err => {
......@@ -282,7 +188,6 @@
method: 'GET',
data: {},
header: {
//设置参数内容类型为x-www-form-urlencoded
'content-type': 'application/x-www-form-urlencoded',
'Accept': 'application/json'
},
......@@ -302,7 +207,7 @@
})
}
},
// 下拉加载
//下拉加载
onPullDownRefresh() {
uni.showLoading({
title: '正在刷新中...',
......@@ -310,11 +215,11 @@
})
this.systemConfig()
},
// 上拉加载
//上拉加载
onReachBottom() {},
// 滑动
//滑动
onPageScroll(t) {},
// 分享好友
//分享好友
onShareAppMessage() {
return {
title: this.$Env.getmalltext(),
......@@ -323,7 +228,7 @@
success: (res) => {},
}
},
// 分享朋友圈
//分享朋友圈
onShareTimeline() {
return {
title: this.$Env.getmalltext(),
......@@ -340,10 +245,6 @@
}
},
onShow() {
// let sys = this.$base.appInformation ? this.$base.appInformation:wx.getSystemInfoSync();// 自定义页头适配
// pixelRationum = sys.windowWidth / 375
// let navBarHeight = sys.screenHeight - sys.windowHeight - sys.statusBarHeight;
// this.titleHeight = sys.statusBarHeight + 46
this.systemConfig()
}
};
......
pages/index/scrollView.vue
......@@ -17,7 +17,6 @@
style="width: 139upx; height: 255upx; margin: auto; border-radius: 14px; overflow: hidden;"
:src="(item.image ? item.image:item.url) + '?x-oss-process=image/resize,lfit,w_112'"
mode="aspectFit"></image>
</view>
</view>
<view class="align-center"
......@@ -77,7 +76,6 @@
historyQueryPage: {
goods_id: "", //产品Id
s: 'Works.myList',
}, //历史对象
datalist: [], //作品、贴图列表
......
pages/index/shapeScrollView.vue
......@@ -124,7 +124,7 @@
}
this.getShapeList()
},
// 模板形状列表
//模板形状列表
getShapeList(){
console.log(this.windowHeight)
this.datalist = []
......
pages/index/switchGoods.vue
<template>
<view v-if="isShow"
style=" position: absolute; top: 0; width: 100%; height: 100%; display: flex; flex-direction: column; "
@click="closeView()">
<view v-if="isShow" style=" width: 100%; height: 100%; ">
<view
style="position: absolute; top: 0; width: 100%; height: 100%; background: #999999; z-index: 999; opacity: 0.5; ">
style="position: absolute; top: 0; width: 100%; height: 100%; background: #999999; z-index:997; opacity: 0.5; "
@click="closeView()">
</view>
<view style=" position: absolute;
top: calc(50% - 620upx);
height: 1250upx;
width: 100%;
margin:auto;
display: flex;
flex-direction: column;
justify-content: center;
z-index: 999;">
<scroll-view scroll-y scroll-with-animation style="box-sizing: border-box;white-space: nowrap;
width: 700upx; margin:0 auto; overflow: hidden; height: 100%;">
<view v-for="(item,index) in goods" :key="index" @click="goodclick(item)">
<view style="float: left; margin: 10upx;
display: flex;align-items: center;
background: #fff;border-radius: 15upx; position: relative;
height: 300upx; width: 210upx;" hover-class="brandactive" :class="[brandtext == item.title ? 'brandactive':'' ]">
<image mode="widthFix" style="width:calc(100% - 60upx);margin: auto;"
:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_700'"></image>
<!-- front_image -->
<!-- :src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_700'"></image> -->
<view style="text-align: center; font-size: 24upx; width: 100%;
color:#333; position: absolute; bottom: 20upx; ">
{{item !=null ? item.name : ''}}
<view
style=" width: 562upx; border-radius: 20upx; height: 742upx; z-index: 998; position: absolute ;margin:auto; top:0; right: 0; left: 0; bottom: 0;flex-direction: column">
<image src="../../static/icon_home_good_back.png" style="width: 562upx; border-radius: 20upx;
height: 720upx;
left:50%;
top:50%;
transform: translate(-50%,-50%);
position: absolute; " />
<view style="position: absolute;
width: 562upx; height:720upx;
top: 0; ">
<view style="
width: 200upx;
height: 120upx;
font-size: 34upx;
font-weight: 500;
color: #000; margin: 0 auto;
text-align: center;line-height: 120upx;">蛋糕形状</view>
<view style="height: 280upx; ">
<view v-for="(item,index) in goods" :key="index" @click="goodclick(item,index)">
<view style="
margin-left: 70upx;
float: left;
border-radius: 15upx;
position: relative;
width: 180upx">
<image mode="center"
:class="[goodCurrentIndexTop == index? 'good-item-select':'good-item-no-select' ]"
:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_210'"></image>
<view style="text-align: center; font-size: 30upx; width: 100%;
color:#000; margin-top: 30upx;">
{{item !=null ? item.name : ''}}
</view>
</view>
</view>
</view>
</scroll-view>
<!-- <swiper class="swiper-block" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
circular='false' previous-margin='80rpx' next-margin='80rpx' :current="currentIndex"
@change="swiperChangeGood">
<swiper-item class="swiper-item" v-for="(item,index) in goods" :key="index" >
<view @click="goodclick(item)" :class="['slide-image', currentIndex === index?'active':'']" mode="aspectFill"
style="justify-content: center; align-items: center; ">
<image :src="item.front_image_old + '?x-oss-process=image/resize,lfit,w_450'"
style="width: 450upx; position: absolute;left: 50%;top:50%;transform: translate(-50%,-50%);"
mode="widthFix">
</image>
</view>
<view
style="width: 100%;font-size: 28upx;color: #333333;text-align: center; position: absolute; bottom: 100upx; z-index: 999; ">
{{item !=null ? item.name : ''}}
<view
style="margin-top: 50upx; width: 100%; display: flex; flex-direction: row; justify-content: center;">
<view v-for="(item,index) in selectGood.attribute" :key="index" @click="sizeclick(item,index)">
<view style="
border-radius: 15upx;
position: relative;
margin: 10upx;">
<view :class="[sizeCurrentIndexTop == index? 'size-item-select':'size-item-no-select' ]">
{{item !=null ? item.title : ''}}
</view>
</view>
</view>
</swiper-item>
</swiper> -->
</view>
<view @click="saveGood()" style="width: 289upx;
height: 84upx;
background: #F29F3D;
border-radius: 42px;
color: #fff;
font-size: 32upx;
margin: 0 auto;
line-height: 84upx;
margin-top:60upx;
text-align: center;"> 确定</view>
</view>
</view>
</view>
......@@ -65,39 +84,55 @@
data() {
return {
isShow: false, //是否显示
goodtext: '', //选择商品名称
/* 控制被选中 */
currentIndex: 0,
/* 控制位置 */
goodsitem: null,
queryPage: {
s: 'Material.list',
},
goods: [], //商品列表
machine_id: null, //机器码
selectGood: null, //选中商品
goodCurrentIndexTop: 0, //上面商品选中
sizeCurrentIndexTop: 0, //下面尺寸选中
selectGoodSize: null, //选中商品尺寸
};
},
mounted() {},
methods: {
//保存商品
saveGood() {
if (this.selectGood == null) {
return;
}
if (this.selectGoodSize == null) {
return;
}
this.isShow = false;
this.goodtext = this.selectGoodSize.title //选择商品名
//console.log("this.goodtext="+this.goodtext);
this.$emit('selectGoodItem', {
id: this.selectGood.id,
title: this.goodtext,
key: this.selectGoodSize.key,
})
},
//关闭视图
closeView() {
this.isShow = false;
},
//商品列表滚
swiperChangeGood(event) {
this.currentIndex = event.detail.current
//商品点击事件
goodclick(item, index) {
this.selectGood = item;
this.goodCurrentIndexTop = index;
this.sizeCurrentIndexTop = 0;
if (this.selectGood.attribute && this.selectGood.attribute.length > 0) {
this.selectGoodSize = this.selectGood.attribute[0];
}
},
//商品点击事件
goodclick(e) {
this.isShow = false;
this.goodtext = e.name //选择商品名
this.$emit('selectGoodItem', {
id: e.id,
})
sizeclick(item, index) {
this.selectGoodSize = item
this.sizeCurrentIndexTop = index;
},
//打开页面
......@@ -110,11 +145,17 @@
getGooods() {
let that = this;
homeservice.queryList({
s: 'Product.getCommonGoods', //新接口
machine_id: this.machine_id, //机器码
machine_id: this.machine_id,
s: 'machine.newDetail'
}).then(result => {
this.goods = result;
if (this.goods == null || this.goods == "") {
this.goods = result.goods;
if (this.goods != null && this.goods.length > 0) {
this.selectGood = this.goods[0];
}
if (this.selectGood.attribute && this.selectGood.attribute.length > 0) {
this.selectGoodSize = this.selectGood.attribute[0];
}
if (this.goods == null || this.goods.length == 0) {
this.isShow = false;
uni.showToast({
title: "设备号不存在，或者没配置商品",
......@@ -151,52 +192,43 @@
.swiper-block {
height: 100%;
width: 100%;
/* height: calc(100% - 300upx);
width: 100%;
position: absolute;
top: 150upx; */
}
.swiper-item {
display: flex;
flex-direction: column;
justify-content: center;
align-items: flex-start;
overflow: unset;
.good-item-select {
border: 5upx #F29F3D solid;
height: 180upx;
width: 180upx;
border-radius: 15upx;
}
.slide-image {
height: calc(100% - 100upx);
width: 520upx;
border-radius: 20upx;
z-index: 1;
margin: 0upx 40upx;
background: url("../../static/item_good_frame.png")
.good-item-no-select {
height: 180upx;
width: 180upx;
border-radius: 15upx;
border: 5upx transparent solid;
}
.active {
transform: scale(1.14);
transition: all 0.2s ease-in 0s;
z-index: 20;
.size-item-select {
border: 2upx #F29F3D solid;
width: 66upx;
height: 66upx;
background: #F5F5F5;
border-radius: 15upx;
line-height: 66upx;
color: #000;
font-size: 30upx;
text-align: center;
}
/* .classification {
width: 300upx;
height: 80upx;
line-height: 80upx;
.size-item-no-select {
width: 66upx;
height: 66upx;
background: #F5F5F5;
border-radius: 15upx;
line-height: 66upx;
font-size: 30upx;
color: #000;
text-align: center;
background: #EEEEEE;
border-radius: 0 0 40upx 0;
font-size: 36upx;
color: #666666;
&.active {
background: #864BC3 !important;
color: #FFFFFF !important;
}
} */
// 分类
border: 2upx transparent solid;
}
</style>
pages/mall/lineUp.vue
<template>
<view class="colletion full-width">
<myhead :worksid="works_id" :title="'排队列表'" :color="'#131319'" :titleShow="true" :backShow="true":background="'#fff'"></myhead>
<myhead :worksid="works_id" :title="'排队列表'" :color="'#131319'" :titleShow="true" :backShow="true" :background="'#fff'"></myhead>
<view class="uni-tab-bar full-width">
<view class="content full-width" scroll-y :style="{ marginTop : headheight + 'px'}">
......@@ -15,140 +15,76 @@
<view class="noData_but" @click="tomain()">去定制</view>
</view>
</view>
<view v-else v-for="(designer, index) in LoupanList" :key="index" style=" width: 690upx;
margin: 20upx auto; border-radius: 10upx; " @click="self_help_payment(designer)"
<view v-else v-for="(designer, index) in LoupanList" :key="index" style=" width: 690upx; height: 185upx;
margin: 20upx auto; border-radius: 10upx; " @click="self_help_payment(designer)"
:style="{background: designer.status.value == 1 ? '#ffffff' :'#EEEEEE;'}">
<view style=" display: flex; align-items: center;">
<view v-if="designer.user_id != userId"
style="margin:20upx 20upx;width: 140upx; height: 140upx; position: relative; overflow: hidden; opacity: 0.3; ">
<view style="width: 100%; height: 100%;border-radius: 20upx; background: #FFFFFF;">
style="margin:20upx 20upx;width: 340upx; height: 140upx; position: relative; overflow: hidden; opacity: 0.3; ">
<view style="width: 140upx; height: 140upx;border-radius: 20upx; background: #FFFFFF;">
</view>
<image style="width: 70upx; height: 70upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0;
margin: auto; z-index:2;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"mode="aspectFit"></image>
<image style="width: 90upx; height: 90upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0;
margin: auto; z-index:2;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'" mode="aspectFit"></image>
</view>
<view v-if="designer.user_id == userId"
style="margin:20upx 20upx;width: 140upx; height: 140upx; position: relative; overflow: hidden; ">
<view style="width: 100%; height: 100%;border-radius: 20upx; background: #FFFFFF;"></view>
<!-- :src="designer.front_image_old" mode="aspectFit"></image> -->
<image style="width: 70upx; height: 70upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0;
style="margin:20upx 20upx;width: 340upx; height: 140upx; position: relative; overflow: hidden; ">
<view style="width: 140upx; height: 140upx;border-radius: 20upx; background: #FFFFFF;"></view>
<image style="width: 90upx; height: 90upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0;
margin: auto; z-index:2;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"mode="aspectFit"></image>
</view>
<view style="width: calc(100% - 330upx);">
<view style="width: 90%;font-size: 28upx;">
<text style="font-size: 36upx;">{{designer.id || ''}}</text>
<view style="width: 100% ; margin-top: -40upx;">
<view v-if="designer.status.value == 1">
<view style="text-align: left; font-size: 29upx; color: #F29F3D ; line-height: 80upx;font-weight: 600;"> 打印中
</view>
</view>
<view style="font-size: 24upx; color: #333333; margin-top: 30upx;">
{{designer.goods_specs || ''}}
<view v-else >
<view style="text-align: left; font-size: 30upx; color: #333; line-height: 80upx;font-weight: 600; margin-top: 20upx;"> 排队中</view>
</view>
</view>
<view v-if="designer.status.value == 1" style="width: 136upx; height: 60upx;background: #F29F3D;opacity: 0.86;border-radius: 30px; margin-top: 70upx;">
<view style="text-align: center; font-size: 26upx; color: #FFFFFF; line-height: 60upx;"> 打印中
<view style="font-size: 29upx; color: #333333; margin-top: 20upx; font-weight: 600;">
{{designer.goods_name || ''}} {{designer.goods_specs || ''}}
</view>
</view>
<view v-else style="width: 136upx; height: 60upx;border-radius: 30upx;margin-top: 70upx;">
<view style="text-align: center; font-size: 26upx; color: #67C4CA; line-height: 60upx;"> 排队中
</view>
<view style="width: 90%;font-size: 28upx; margin-top: 70upx; font-weight: 550; text-align: right; font-size: 36upx; color: #333; margin-right: 30upx;">
{{designer.id || ''}}
</view>
</view>
</view>
</view>
<!-- 提示 -->
<view v-if="sighstate">
<!-- background:rgba(0,0,0,0.6); -->
<view
style="position: fixed; z-index:999; width: 100%; height: 100%; top: 0; background:rgba(0,0,0,0.6); justify-content: center;"
<view v-if="sighstate && designer != null">
<view style="position: fixed; z-index:999; width: 100%; height: 100%; background:rgba(0,0,0,0.6); top: 0;"
@click.stop="sighstate = false"></view>
<view style="position: fixed; z-index: 1000; top: 52%; left: 50%; right: 0; margin: auto; transform: translate(-50%, -50%);
width: 558upx; height: 650upx; background: #FFFFFF; border-radius: 10upx;
<view style="position: fixed; z-index: 1000; top: 0; left: 0; bottom: 0; right: 0; margin: auto;
width: 558upx; height: 490upx; background: #FFFFFF; border-radius: 10upx;
display: flex; align-items: center; justify-content: center;">
<view style="position: absolute;
top: 0; right: 0;" @click="sighstate = false">
<view style="position: absolute;
top: 0; right: 0;" @click.stop="sighstate = false">
<image src="../../static/icon_guanbi.png" mode=""
style="width: 26upx; height: 26upx; padding: 20upx; "></image>
</view>
<!-- <view v-if=" designer.goods_name == '背包' " style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_80'"mode="aspectFit" style="width:80upx; margin-left: 100upx;"></image>
<image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_300'"mode="aspectFit" style=" width: 300upx;margin-left: -200upx;"></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view> -->
<!-- goods_name=马卡龙 -->
<view v-if=" designer.goods_name == '马卡龙' " style="width: 558upx; margin-top: 60upx; ">
<view style="display: flex; align-items: center; justify-content: center;
width: 500upx; height: 340upx; position: relative; margin: auto;">
<view style="width: 100%; height: 100%; display: flex; border: 1px solid #09BB07;">
<view style="width: calc(100% / 4); height: 100%;" v-for="item in 4" :key="a">
<view v-for="item in 3" :key="b"
style="width: 100%; height: calc(100% / 3); position: relative; overflow: hidden;">
<image style="width: 100%; height: 100%;position: absolute;
top: 0; left: 0; right: 0; bottom: 0;
margin:auto; z-index: 1;" :src="designer.front_image_old" mode="aspectFit"></image>
<image style="width: 36%; height: 36%; position: absolute;
top: 0; left: 0; right: 0; bottom: 0;
margin: auto; z-index:1;" :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"
mode="aspectFit"></image>
<image style="width: 100%; height: 100%;position: absolute;
top: 0; left: 0; right: 0; bottom: 0;
margin:auto; z-index: 2;" :src="designer.front_image" mode="aspectFit"></image>
</view>
</view>
</view>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
<view v-if="designer.user_id == userId " @click="toOrderDetail(designer)" style="width: 135upx; height: 55upx;background: #E7BC15;
border-radius: 40upx;
color: #FFFFFF;
margin:10upx auto;
text-align: center;
padding:auto;
padding-top: 15upx;">查看详情</view>
style="width: 26upx; height: 26upx; padding: 12upx 22upx;"></image>
</view>
<!--<view v-if=" designer.goods_name == '单肩袋' " style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_140'"mode="aspectFit" style="width:140upx; margin-left: 100upx;"></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
</view> -->
<view v-if=" designer.goods_name != '马卡龙' "
style="width: 558upx;">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 360upx; ">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_100'" mode="aspectFit" style="width:100upx; "></image>
<!-- <image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_290'" mode="aspectFit" style=" width: 300upx;margin-left: -200upx;"></image> -->
<view style="width: 558upx;position: absolute; top: 40upx ">
<view style="display: flex; align-items: center; justify-content: center;
width: 100%; height: 200upx; margin: auto;">
<image :src="designer.works_image + '?x-oss-process=image/resize,lfit,w_120'"
mode="aspectFit" style=" margin: auto; width: 120upx; max-height: 200upx; "></image>
</view>
<view style="text-align: center; font-size: 36upx; margin-top: 58upx;">作品排队中</view>
<view style="text-align: center; font-size: 36upx;">如需要打印可与客服确认</view>
<view v-if="designer.user_id == userId " @click="toOrderDetail(designer)" style="width: 135upx; height: 55upx;background: #E7BC15;
<!-- 作品排队中 -->
<view style="text-align: center; font-size: 34upx; margin-top: 50upx;">{{lineStatusText}}</view>
<view style="text-align: center; font-size: 34upx;">如需要打印可与客服确认</view>
<view v-if="designer.user_id == userId " @click="toOrderDetail(designer)" style="width: 135upx; height: 50upx;background: #F29F3D ;
border-radius: 40upx;
color: #FFFFFF;
margin:10upx auto;
text-align: center;
padding:auto;
padding-top: 15upx;">查看详情</view>
padding-top: 20upx;
margin-top: 15upx;" >查看详情</view>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
......@@ -176,7 +112,6 @@
machine_id: null,
page: 1,
per_page: 15,
// total: 0
},
stateindex: false,
key: 2, //1直营配送站 2 万能通用版 3色彩自助站
......@@ -189,7 +124,7 @@
};
},
methods: {
//订单详情
toOrderDetail(item) {
this.sighstate = false;
......@@ -214,7 +149,7 @@
}
});
},
self_help_payment(designer) {
if (designer.user_id != this.userId) {
return;
......@@ -223,25 +158,11 @@
machine_id: this.queryPage.machine_id,
s: 'machine.newDetail',
}).then(res => {
/* if (designer.status.value == 1) {
if (designer.goods_name == "马卡龙") {
this.clearIntervalTime()
uni.navigateTo({
url: '../mine/self_help_payment_details?orderId=' + designer.order_id +
'&type=' + this.key + '&machine_id=' + this.queryPage.machine_id
})
} else {
uni.navigateTo({
url: '../mine/self_help_payment_details_new?orderId=' + designer
.order_id +
'&type= 2' + '&machine_id=' + this.queryPage.machine_id
})
}
} else { */
if (this.sighstate == true) return;
this.designer = designer
this.sighstate = true
/* } */
if (this.sighstate == true) return;
this.designer = designer
this.sighstate = true
}).catch(err => {
uni.showToast({
title: '设备休息中',
......@@ -291,7 +212,7 @@
//数据加载状态处理 false
this.dataLoadState.pullDownRefresh = false;
this.dataLoadState.reachBottom = false;
this.stateindex = true
// uni.hideLoading();
}).catch(err => {
......@@ -357,7 +278,7 @@
},
onShow() {
},
created() {
......@@ -385,7 +306,7 @@
})
}
}
};
</script>
......
pages/mine/self_help_payment_details.vue
......@@ -5,10 +5,7 @@
:background="'#fff'"></myhead>
<!-- 打印机音乐 -->
<audio src="https://img.colorpark.cn/wechat/ring2.m4a" :action="ringaction" controls loop
style="opacity: 0; position: absolute;"></audio>
......
project.config.json 0 → 100644
{
"appid": "wx1f880e9650ae72ac",
"compileType": "miniprogram",
"libVersion": "2.27.0",
"packOptions": {
"ignore": [],
"include": []
},
"setting": {
"coverView": true,
"es6": true,
"postcss": true,
"minified": true,
"enhance": true,
"showShadowRootInWxmlPanel": true,
"packNpmRelationList": [],
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 4
}
}
\ No newline at end of file
project.private.config.json 0 → 100644
{
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "wechat_baking",
"setting": {
"compileHotReLoad": true
}
}
\ No newline at end of file
static/icon/icon_refresh.png
static/icon/icon_refresh.png

971 Bytes | W: | H:

static/icon/icon_refresh.png

971 Bytes | 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
static/icon/icon_refresh_red.png

1.49 KB | W: | H:

static/icon/icon_refresh_red.png

1.49 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/replace.png
static/icon/replace.png

2.05 KB | W: | H:

static/icon/replace.png

1.37 KB | W: | H:

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

486 Bytes | W: | H:

static/icon_confirm.png

469 Bytes | W: | H:

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

37.3 KB | W: | H:

static/liebiao.png

34.9 KB | W: | H:

static/liebiao.png
static/liebiao.png
static/liebiao.png
static/liebiao.png
  • 2-up
  • Swipe
  • Onion skin
util/Env.js
......@@ -18,9 +18,9 @@ const baseURL = baseApi[accountInfo.miniProgram.envVersion]
const Env = {
getDevBaseURL: () => baseURL,
getBaseURL: () => baseURL,
getmachineId: () => '100055', //线上100086 //测试 422001' //100086 //100055
getmachineId: () => '7122001', //7122001 //100160
getappcode: () => 'lite',
getmalltext: () => "色彩公园Lite",
getmalltext: () => "色彩公园烘焙",
getAppID: () => "wx1c777ee874c39b0b",
getcompany: () => "深圳市瑞丰彩科技有限公司",
//跳转--色彩小程序
......@@ -28,6 +28,5 @@ const Env = {
//getenvVersion: () => "trial",
getenvVersion: () => "release",
}
export default Env
\ No newline at end of file
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