Skip to content

K
kxz-app-phone
Commit aa2ffcc4 by huahua
Options

提交

parent 6de8d270
Showing with 51 additions and 330 deletions
pages.json
......@@ -104,24 +104,24 @@
"navigationBarTitleText": "查看尺码"
}
},
{
/* {
"path": "self_help_payment_details",
"style": {
"navigationBarTitleText": "打印"
}
},
{
}, */
/* {
"path": "self_help_payment_details_new",
"style": {
"navigationBarTitleText": "打印"
}
},
{
}, */
/* {
"path": "nothingmachineid",
"style": {
"navigationBarTitleText": "手机壳打印"
}
},
}, */
{
"path": "goodsordersize",
"style": {
......
pages/index/mall.vue
<template>
<view class="full-width full-height">
<view v-if="showType == 0" @tap="doubleTap" @touchstart="touchStart" @touchend="touchEnd"
<view v-if="showType == 0" @tap="doubleTap" @touchstart="touchStart" @touchend="touchEnd"
style="position: fixed; z-index: 99; right: 0; bottom: 550upx; display: flex;align-items: center;justify-content: center;
width: 100upx; height: 88upx; background: linear-gradient(92deg, #64DD17, #64DD17); border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
......
pages/index/start-up.vue
......@@ -52,12 +52,12 @@
<image src="../../static/icon_guaqi.png" mode="aspectFill" class="start_img"></image>
<view class="start_text" style="margin-top: -80upx;font-size: 31upx;">{{machine_id || ''}}</view>
<view class="start_text" style="margin-top: 100upx;">{{msg || ''}}</view>
<view @click="tomakePhoneCall">
<view @click="tomakePhoneCall" v-if="phone">
<view class="start_text">联系客服</view>
<view class="start_text" style="display: flex; justify-content: center; align-items: center;">
<image src="../../static/phone.png" mode=""
style="width: 32upx; height: 32upx; margin-right: 5upx;"></image>
{{phone || '18938664545'}}
{{phone }}
</view>
</view>
</view>
......@@ -71,10 +71,9 @@
</view>
</view>
<view v-if="isShowPop"
<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;
......@@ -151,8 +150,8 @@
<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>
</scroll-view>
</view>
</view>
......@@ -213,7 +212,7 @@
msg: null,
worksid: 3111,
statusloading: null, //加载状态
phone: '18938664545',
phone: '',
isLoad: false, //是否加载
baseSetting: null, //配置信息
moduleInfo: null, //识别型号信息
......@@ -268,7 +267,6 @@
},
open(item) {
this.machine_id = item.machine_id
homeservice.queryList({
s: 'Product.getBrandProducts', //新接口
......@@ -287,7 +285,6 @@
});
},
getBrandList() {
homeservice.queryList({
s: 'Product.getBrands', //新接口
......@@ -415,7 +412,7 @@
mask: true
})
uni.makePhoneCall({
phoneNumber: this.phone || '18938664545', //仅为示例
phoneNumber: this.phone, //仅为示例
success(res) {
uni.hideLoading();
},
......@@ -485,8 +482,7 @@
uni.openSetting({
success(res) {
that.getAuthorize()
},
fail(err) {
},fail(err) {
}
})
......@@ -630,7 +626,6 @@
this.$base.lockInventory = result //锁库存储存信息
this.$base.lockInventory.dict_id = this.dict_id
this.sn = result.sn
uni.navigateTo({
url: '../index/index?machine_id=' + this.machine_id + '&goods_id=' + this.goods_id +
'&key=' + this.key + '&sn=' + this.sn + '&dict_id=' + this.dict_id +
......
pages/login/login.vue
......@@ -6,7 +6,7 @@
<view class="start_title">壳小站</view>
<view class="start_text">{{startText}}</view>
<view class="longTitle">
<!-- <view>壳小站，把爱穿在身上、棒在手心</view> -->
<!--<view>壳小站，把爱穿在身上、棒在手心</view> -->
你的第一份爱的定制在这里开始
</view>
<view class="footer_but">
......@@ -68,8 +68,8 @@
}
})
let that = this;
// 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
// 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
//推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
//开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
wx.getUserProfile({
lang:'zh_CN',
desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
......@@ -239,12 +239,11 @@
//console.log('wx.getUserProfile')
//console.log(wx.getUserProfile)
if (wx.getUserProfile) {
console.log('wx.getUserProfile可以使用')
this.canIUseGetUserProfile = true
//console.log('wx.getUserProfile可以使用')
this.canIUseGetUserProfile = true
}
// // 判断用户有没有登录
// if (!this.$AppContext.checkLogin()) {
// } else {
// //先登陆
// let stat = this;
......
pages/mall/lineUp.vue
......@@ -22,13 +22,8 @@
<view style="color: #fff; display: flex; align-items: center; justify-content: center;">
<view v-if="designer.user_id != userId" class="border-image-pesudo-no">
<view class="border-image-pesudo-in-no">
<!-- <image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png"
mode="aspectFit"></image>
<image
style="width: 141upx; height: 132upx; margin:auto; display: block;position: absolute; z-index: 10;"
:src="designer.front_image" mode="aspectFit"></image> -->
<image
style="width: 141upx; height: 132upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index:8;"
style="width: 141upx; height: 132upx; position: absolute; top: 0; left: -23upx; right: 0; bottom: 0; margin: auto; z-index:8;"
:src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"
mode="aspectFit">
</image>
......@@ -36,13 +31,8 @@
</view>
<view v-if="designer.user_id == userId" class="border-image-pesudo">
<view class="border-image-pesudo-in">
<!-- <image style="width: 100%;height: 100%;" src="../../static/img/icon_line_up_back.png"
mode="aspectFit"></image>
<image
style="width: 141upx; height: 132upx; margin:auto; display: block;position: absolute; z-index: 10;"
:src="designer.front_image" mode="aspectFit"></image> -->
<image
style="width: 141upx; height: 132upx; position: absolute; top: 0; left: 0; right: 0; bottom: 0; margin: auto; z-index:8;"
style="width: 141upx; height: 132upx; position: absolute; top: 0; left: -23upx; right: 0; bottom: 0; margin: auto; z-index:8;"
:src="designer.works_image + '?x-oss-process=image/resize,lfit,w_300'"
mode="aspectFit">
</image>
......@@ -62,7 +52,6 @@
<text style="font-size: 40upx;font-weight: bold;" v-if="designer.status.value == 1">{{designer.id || ''}}</text>
</view>
</view>
<view style="margin-right: 20upx; margin-left: auto; padding-top:20upx">
<view v-if="designer.status.value == 1"
style="width: 136upx; height: 60upx;background: #61D119;border-radius:30upx;opacity: 0.86; ">
......@@ -79,11 +68,9 @@
</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;"
@click.stop="sighstate = false"></view>
......@@ -95,25 +82,18 @@
<image src="../../static/icon_guanbi.png" mode=""
style="width: 26upx; height: 26upx; padding: 20upx; "></image>
</view>
<view
style="width: 558upx;">
<view 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:360upx; "></image>
<!-- <image :src="designer.back_image + '?x-oss-process=image/resize,lfit,w_290'" 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 style="text-align: center; font-size: 36upx;">如有故障请联系客服</view>
</view>
</view>
</view>
</view>
</view>
</template>
......@@ -175,13 +155,12 @@
machine_id: this.queryPage.machine_id,
s: 'machine.newDetail',
}).then(res => {
/* uni.showToast({
/*uni.showToast({
title: 'jjjjj',
icon: 'none',
duration: 2000
}) */
//this.$refs["showLineUpPop"].open();
//this.$refs['showLineUpPop'].open();
this.designer = designer
this.sighstate = true
......@@ -293,7 +272,7 @@
//console.log("userId=" + userService.getCacheAppUser().userInfo.id);
},
// 卸载程序
//卸载程序
onUnload() {
this.clearIntervalTime()
let pages = getCurrentPages();
......@@ -327,16 +306,15 @@
height: 150upx;
background: #131319;
margin: 25upx 35upx;
margin-left: 0upx;
margin-left: 20upx;
position: relative;
overflow: hidden;
//clip-path: inset(0 round 8upx);
.border-image-pesudo-in {
width: 100%;
height: 100%;
background: #fff;
//background-color: rgba(255,255,255,0.7);
}
}
......@@ -346,9 +324,7 @@
height: 150upx;
background: #fff;
margin: 25upx 35upx;
margin-left: 0upx;
margin-left: 20upx;
position: relative;
overflow: hidden;
opacity: 0.2;
......@@ -357,35 +333,11 @@
width: 100%;
height: 100%;
background: #fff;
//background-color: rgba(255,255,255,0.7);
}
}
/* .border-image-pesudo::before {
content: "";
position: absolute;
width: 140upx;
height: 140upx;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
border: 10upx solid;
background: #131319;
border: 5upx solid;
border-image: linear-gradient(0deg, #178CE6, #984ACE) 2 2;
} */
.colletion {
/* .cart-ticket-null {
padding-top: 50upx;
} */
.content {}
}
</style>
pages/mine/nothingmachineid.vue deleted 100644 → 0
<template>
<view class="full-width full-height" style="padding-top: 90upx;">
<view style="width: 220upx; margin:0 auto 40upx;">
<image style="width: 220upx; height: 220upx; border-radius: 50%;" src="../../static/mine/Pick-up.png" mode="aspectFill"></image>
</view>
<view style="font-size: 36upx; font-weight: 400; color: #FFFFFF; text-align: center;">
保存成功
</view>
<view style="width: 430upx;
height: 90upx;
background: rgb(40, 41, 50,0.67);
border-radius: 45upx;
margin: 119upx auto 0;
font-size: 36upx;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 90upx;
text-align: center;
color: #FFFFFF;" @click="login()">
立即查看
</view>
</view>
</template>
<script>
import homeservice from '@/service/homeservice.js'
export default {
components: {},
computed: {},
data() {
return {
};
},
methods: {
login() {
// develop 开发版
// trial 体验版
// release 正式版
wx.navigateToMiniProgram({
appId: 'wx55b5b6d95c648041',
path: '/pages/index/mine',
extraData: {
foo: 'bar'
},
envVersion: 'trial',
success(res) {
// 打开成功
}
})
}
},
onPullDownRefresh() {
},
onLoad(options) {
},
onShow() {
}
};
</script>
<style lang="scss">
page {
background: #131319 !important;
color: #fff;
}
</style>
pages/mine/order.vue
......@@ -122,24 +122,28 @@
numberY: 0,
state: false,
},
transformscale: 1, //整体缩小
transformscale: 1, //整体缩小
key: null,
background_surface_image: null, //定制壳手机壳底色
machineDetail: null, //设备详情
customize_size_id: "", //自定以产品Id
machineDetail: null, //设备详情
customize_size_id: "", //自定以产品Id
};
},
methods: {
dragStart(e) {
},
dragMove(e) {
},
//拖动结束事件
dragEnd(e) {
//if (!this.coordinate.state) return;
},
//创建订单
self_help() {
let data = {
......@@ -269,6 +273,7 @@
}
}
},
zhifu() {
let data = {
s: 'Order.create',
......@@ -286,7 +291,6 @@
user_address: null, // 用户下单地址
terminal: this.$base.terminal, // 下单渠道
promoter_id: this.$base.promoter_id, // 推广的员的编号
surface_type: this.$base.surfaceData.surface_type, //材质类型 0：默认 1：自带壳 2：定制壳
surface_id: this.$base.surfaceData.surface_id, //材质对应的编号，没有的话就为0或者不传
surface_color_series_id: this.$base.surfaceData.surface_color_series_id, //选择的色系编号，没有的话就不传或者为0
......@@ -298,14 +302,11 @@
}
this.loading = true; //防止多次点击支付
let seft = this
//console.log("打印22")
uni.showLoading({
title: '正在提交中...'
})
homeservice.WorksList(data).then(result => {
//console.log('result', result)
if (this.tabletext) {
this.resultpayone = result
this.orderIdone = result.order_id
......@@ -325,6 +326,7 @@
});
});
},
payment(params, order_id) {
let seft = this
uni.requestPayment({
......@@ -346,12 +348,10 @@
});
let type = this.tabletext ? 3 : 1 //1：配送版，2：单机版，3：自助版
setTimeout(() => {
uni.navigateTo({
url: '../mall/lineUp?machine_id=' + seft.machine_id + '&key=' +
seft.key
})
/* uni.navigateTo({
url: './self_help_payment_details?orderId=' + order_id +
'&type=' + type + '&machine_id=' + seft.machine_id
......@@ -374,7 +374,8 @@
}
});
},
// 获取库存与优惠券信息
//获取库存与优惠券信息
getMachineStock() {
homeservice.queryList({
s: 'Machine.getMachineStock',
......@@ -396,30 +397,16 @@
});
});
},
//设备进来的
machine_pageslist(e) {
this.machine_pages = false
this.machine_item = this.machineDetail
this.machine_item.machine_category_text = this.machineDetail.category.title
this.key = this.machineDetail.category.key
this.getMachineStock()
// homeservice.WorksList({
// s: 'machine.detail',
// machine_id: this.machine_id,
// }).then(res => {
// this.machine_item = res
// this.machine_item.category.forEach(item=>{
// if(item.id == this.machine_item.machine_category_id){
// this.machine_item.machine_category_text = item.title
// this.key = item.key
// }
// })
// this.getMachineStock()
// }).catch(err => {
// uni.showToast({title: err.msg,icon: 'none'})
// });
},
Worksdetail() { //获取作品详情
homeservice.WorksList({
s: 'Works.detail',
......
pages/mine/orderNew.vue
......@@ -98,7 +98,6 @@
</view>
</view>
</scroll-view>
<view style="background: #282932; height: 100upx; position: fixed; width: 100%; bottom: 0; z-index: 999;">
<view v-if="support_pay == 1" style="width: 100%; height: 100upx;
......@@ -106,14 +105,13 @@
font-weight: 400; text-align: center; line-height: 100upx; float: right; color: #FFFFFF;" @click="commitOrder">
支付领取
</view>
<view v-if="support_pay == 0" style="width: 100%; height: 100upx;
background: linear-gradient(-90deg, #178CE6, #984ACE); font-size: 36upx;
font-weight: 400; text-align: center; line-height: 100upx; float: right; color: #FFFFFF;" @click="commitOrder">
免费领取
</view>
</view>
</view>
</template>
......@@ -173,7 +171,6 @@
machine_pages: true, //设备进来的状态
myadress: {},
loading: false,
orderIdone: null, //订单号
orderIdtwo: null, //订单号
resultpayone: null,
......@@ -184,7 +181,6 @@
crateactivestate: false, //开始自转
titlestate: false,
isReady: false, //礼花
data: {
windowWidth: 0, // 屏幕宽度
windowHeight: 0, // 屏幕高度
......@@ -213,7 +209,6 @@
support_pay: 1 ,//0 不支付 1 支付
machineDetail:null,//设备详情
customize_size_id: "", //自定以产品Id
};
},
methods: {
......@@ -234,7 +229,8 @@
this.coordinate.startX = e.touches[0].clientX;
this.coordinate.startY = e.touches[0].clientY;
},
// 拖动结束事件
//拖动结束事件
dragEnd(e) {
if (!this.coordinate.state) return;
},
......@@ -275,8 +271,7 @@
data.user_address = {
receivor: this.addresslist.receivor,
phone: this.addresslist.phone,
address: this.addresslist.province + this.addresslist.city + this.addresslist.county + this
.addresslist.detail
address: this.addresslist.province + this.addresslist.city + this.addresslist.county + this.addresslist.detail
}
}
uni.showLoading({
......
pages/sunburst/index.vue deleted 100644 → 0
<template>
<view class="qiun-columns">
<!-- <view class="qiun-bg-white qiun-title-bar qiun-common-mt">
<view class="qiun-title-dot-light">饼状图</view>
</view> -->
<view class="qiun-charts">
<canvas canvas-id="canvasPie" id="canvasPie" class="charts" @touchstart="touchPie"></canvas>
</view>
</view>
</template>
<script>
import uCharts from '@/js_sdk/u-charts/u-charts.js';
var _self;
var canvaPie = null;
export default {
data() {
return {
cWidth: '',
cHeight: '',
pixelRatio: 1,
serverData: '',
}
},
onLoad() {
_self = this;
this.cWidth = uni.upx2px(750);
this.cHeight = uni.upx2px(500);
this.getServerData();
},
methods: {
getServerData() {
let Pie = {
series: [
{"name": "黄色","data": 50,color: "#ffa974"},
{"name": "白色","data": 30,color: "#8543e0"},
{"name": "粉色","data": 20,color: "#90ed7d"},
{"name": "黑色","data": 18,color: "#ffa974"},
{"name": "蓝色","data": 8,color: "#2fc25b"},
]
};
_self.showPie("canvasPie", Pie);
},
showPie(canvasId, chartData) {
canvaPie = new uCharts({
$this: _self,
canvasId: canvasId,
type: 'pie',
fontSize: 11,
background: '#FFFFFF',
pixelRatio: _self.pixelRatio,
series: chartData.series,
animation: true,
width: _self.cWidth * _self.pixelRatio,
height: _self.cHeight * _self.pixelRatio,
legend:false,//图例设置，是否显示图表下方各类别的标识
dataLabel: false,//是否在图表中显示数据标签内容值
dataPointShape: false,//是否在图表中显示数据点图形标识
extra: {
pie: {
lableWidth: 15
}
},
});
},
touchPie(e) {
canvaPie.showToolTip(e, {
format: function(item) {
//console.log(item)
return item.name + ':' + item.data
}
});
},
}
}
</script>
<style>
page {
background: #F2F2F2;
width: 750upx;
overflow-x: hidden;
}
.qiun-padding {
padding: 2%;
width: 96%;
}
.qiun-wrap {
display: flex;
flex-wrap: wrap;
}
.qiun-rows {
display: flex;
flex-direction: row !important;
}
.qiun-columns {
display: flex;
flex-direction: column !important;
}
.qiun-common-mt {
margin-top: 10upx;
}
.qiun-bg-white {
background: #FFFFFF;
}
.qiun-title-bar {
width: 96%;
padding: 10upx 2%;
flex-wrap: nowrap;
}
.qiun-title-dot-light {
border-left: 10upx solid #0ea391;
padding-left: 10upx;
font-size: 32upx;
color: #000000
}
.qiun-charts {
width: 750upx;
height: 500upx;
background-color: #FFFFFF;
}
.charts {
width: 750upx;
height: 500upx;
background-color: #FFFFFF;
}
</style>
static/home_icon_default_no.png
static/home_icon_default_no.png

20.6 KB | W: | H:

static/home_icon_default_no.png

4.13 KB | W: | H:

static/home_icon_default_no.png
static/home_icon_default_no.png
static/home_icon_default_no.png
static/home_icon_default_no.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_default_no.png
static/icon_default_no.png

20.6 KB | W: | H:

static/icon_default_no.png

4.13 KB | W: | H:

static/icon_default_no.png
static/icon_default_no.png
static/icon_default_no.png
static/icon_default_no.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_diy_anime_style.png
static/icon_diy_anime_style.png

37.3 KB | W: | H:

static/icon_diy_anime_style.png

7.54 KB | W: | H:

static/icon_diy_anime_style.png
static/icon_diy_anime_style.png
static/icon_diy_anime_style.png
static/icon_diy_anime_style.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_diy_enhance_style.png
static/icon_diy_enhance_style.png

34.7 KB | W: | H:

static/icon_diy_enhance_style.png

6.02 KB | W: | H:

static/icon_diy_enhance_style.png
static/icon_diy_enhance_style.png
static/icon_diy_enhance_style.png
static/icon_diy_enhance_style.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_diy_matting_style.png
static/icon_diy_matting_style.png

28.8 KB | W: | H:

static/icon_diy_matting_style.png

5.31 KB | W: | H:

static/icon_diy_matting_style.png
static/icon_diy_matting_style.png
static/icon_diy_matting_style.png
static/icon_diy_matting_style.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png

17.5 KB | W: | H:

static/icon_diy_sketch_style.png

4 KB | W: | H:

static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png
static/icon_diy_sketch_style.png
  • 2-up
  • Swipe
  • Onion skin
util/Env.js
......@@ -5,8 +5,8 @@ if(!accountInfo.miniProgram.envVersion){
const baseApi = {
//开发版
develop: "https://kxz.refinecolor.com",
//develop: "https://print.kexiaozhan.cn",
//develop: "https://kxz.refinecolor.com",
develop: "https://print.kexiaozhan.cn",
//体验版
trial: "https://kxz.refinecolor.com",
//正式版
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment