czg_team/cashier_weapp
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单相关修改提测

Browse Source
This commit is contained in:
GaoHao
2024-09-09 11:08:04 +08:00
parent c2ff506543
commit 2dbcdf4300
45 changed files with 1377 additions and 3506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/cwx-keyboard/cwx-keyboard.vue
View File

@@ -70,7 +70,6 @@
methods: {
touchstart() {
this.Time = setInterval(() => {
console.log(this.money);
if (this.money == '') {
clearInterval();
}
@@ -82,7 +81,7 @@
},
//处理按键
_handleKeyPress(e) {
console.log('点击传e', e.target.dataset.num);
// console.log('点击传e', e.target.dataset.num);
let num = e.target.dataset.num;
//不同按键处理逻辑
// -1 代表无效按键，直接返回
@@ -141,8 +140,6 @@
//处理数字
_handleNumberKey(num) {
let S = this.money;
//如果有小数点且小数点位数不小于2
// if (S.indexOf('.') > -1 && S.substring(S.indexOf('.') + 1).length < 2)
@@ -157,8 +154,6 @@
// this.money = S + num;
// }
// }
console.log(this.money)
console.log(this.money,this.money.length)
if (this.money.length == 6) {
this.$emit('confirmEvent', this.money); //提交参数
return

55
components/nav.vue
View File

@@ -2,36 +2,42 @@
<view class="content">
<!-- 导航栏 -->
<view class="navbar" :class="{active:opacity}">
<!-- #ifndef APP-PLUS || MP-WEIXIN -->
<!-- #ifndef APP-PLUS || MP-WEIXIN || MP-ALIPAY -->
<view class="status-bar"></view>
<view class="navbar_tow flex-between"
<view class="navbar_tow 1 flex-between"
:style="{'height':HeighT.customBar+'px','padding-right':HeighT.custwidth + 'px'}">
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<view class="status-bar"></view>
<view class="navbar_tow flex-between">
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="navbar_tow flex-between"
:style="{'height':HeighT.customBar+'px','marginTop':HeighT.heightBar+'px','padding-right':HeighT.custwidth + 'px'}">
<!-- #endif -->
<!-- 标题搜索框 -->
<view class="flex-between">
<view class="navbar_tow_one flex-start">
<u-icon style="margin-left: 8rpx;" name="arrow-down-fill" color="#333333"
size="16"></u-icon>
</view>
<view class="navbar_tow_tow flex-start">
<input type="text" class="navbar_tow_towinput" v-model="keyword" placeholder="请输入关键字" />
<view class="navbar_tow_towview">搜索</view>
</view>
</view>
<!-- #ifdef APP-PLUS -->
<view class="status-bar"></view>
<view class="navbar_tow 2 flex-between">
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="navbar_tow 3 flex-between"
:style="{'height':HeighT.customBar+'px','marginTop':HeighT.heightBar+'px','padding-right':HeighT.custwidth + 'px'}">
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view class="navbar_tow 4 flex-between"
:style="{'height':HeighT.customBar+'px','marginTop':HeighT.statusBar+'px','padding-right':menuButtonInfo.width+50 + 'px'}">
<!-- #endif -->
<!-- 标题搜索框 -->
<view class="flex-between">
<view class="navbar_tow_one flex-start">
<u-icon style="margin-left: 8rpx;" name="arrow-down-fill" color="#333333"
size="16"></u-icon>
</view>
<view class="navbar_tow_tow flex-start">
<input type="text" class="navbar_tow_towinput" v-model="keyword" placeholder="请输入关键字" />
<view class="navbar_tow_towview">搜索</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
console.log("menuButtonInfo==",menuButtonInfo)
export default {
data() {
return {
@@ -48,9 +54,14 @@
},
computed: {
HeighT() { //手机类型的尺寸
console.log("navHeighT==",this.$store.getters.is_BarHeight)
return this.$store.getters.is_BarHeight
},
},
mounted() {
console.log(1)
console.log(uni.getMenuButtonBoundingClientRect())
},
methods: {}
};
@@ -153,9 +164,9 @@
}
.navbar_tow_towinput {
height: 64rpx;
padding-left: 32rpx;
padding-right: 116rpx;
height: 100%;
flex: auto;
background: #FFFFFF;
border-radius: 34rpx;

44
components/navseat.vue
View File

@@ -2,24 +2,35 @@
<view class="navbarcontent">
<!-- 导航栏 -->
<view class="navbar" :class="{active:opacity}">
<!-- #ifndef APP-PLUS || MP-WEIXIN -->
<view class="status-bar"></view>
<view class="navbar_tow flex-between"
:style="{'height':HeighT.customBar+'px','padding-right':HeighT.custwidth + 'px'}">
<!-- #ifndef APP-PLUS || MP-WEIXIN || MP-ALIPAY -->
<view class="status-bar"></view>
<view class="navbar_tow flex-between"
:style="{'height':HeighT.customBar+'px','padding-right':HeighT.custwidth + 'px'}">
<!-- #endif -->
<!-- #ifdef APP-PLUS -->
<!-- #ifdef APP-PLUS -->
<view class="navbar_tow flex-between" :style="{'marginTop':HeighT.heightBar /2+'px'}">
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="navbar_tow flex-between"
:style="{'height':HeighT.customBar + ( (HeighT.heightBar - systemInfo.statusBarHeight)*2 )+'px','marginTop': ( HeighT.heightBar - (HeighT.heightBar - systemInfo.statusBarHeight))+'px','padding-right':HeighT.custwidth + 'px'}">
<!-- #endif -->
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="navbar_tow flex-between"
:style="{'height':HeighT.customBar + ( (HeighT.heightBar - systemInfo.statusBarHeight)*2 )+'px','marginTop': ( HeighT.heightBar - (HeighT.heightBar - systemInfo.statusBarHeight))+'px','padding-right':HeighT.custwidth + 'px'}">
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view class="navbar_tow flex-between"
:style="{'height':systemInfo.titleBarHeight+'px','marginTop':systemInfo.statusBarHeight+'px','padding-right':menuButtonInfo.width+50 + 'px'}">
<!-- #endif -->
<!-- 标题搜索框 -->
<view class="flex-between" v-if="opacity&&inputshow">
<!-- #ifndef MP-ALIPAY -->
<view class="navbar_tow_one flex-start" v-if="iconshow" @click="clicknavigateBack">
<u-icon name="arrow-left" :color="iconcolor" size="40"></u-icon>
</view>
<view class="navbar_tow_tow " @click="inputFocus" style="position: relative;">
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="navbar_tow_tow " @click="inputFocus" style="position: relative">
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view class="navbar_tow_tow " @click="inputFocus" style="position: relative;padding-left: 60rpx;">
<!-- #endif -->
<u--input
placeholder="请输入内容"
class="custom-input"
@@ -40,15 +51,21 @@
</view>
<!-- 正常导航栏 -->
<view class="flex-between" @click="clicknavigateBack" v-else>
<!-- #ifndef MP-ALIPAY -->
<view class="navbar_tow_one flex-start" v-if="iconshow">
<u-icon name="arrow-left" :color="iconcolor" size="40"></u-icon>
</view>
<!-- #ifndef MP-WEIXIN -->
<!-- #endif -->
<!-- #ifndef MP-WEIXIN || MP-ALIPAY -->
<view class="navbar_tow_tow" v-if="opacity || titleshow" :style="{color: namecolor}">
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
<view class="navbar_tow_tow" v-if="opacity || titleshow"
:style="{'padding-left':HeighT.custwidth-14 + 'px',color: namecolor}">
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<view class="navbar_tow_tow" v-if="opacity || titleshow"
:style="{'padding-left': 60 + 'rpx','textAlign': 'left',color: namecolor}">
<!-- #endif -->
{{title}}
</view>
@@ -129,6 +146,9 @@
HeighT() { //手机类型的尺寸
return this.$store.getters.is_BarHeight
},
menuButtonInfo() { //手机类型的尺寸
return uni.getMenuButtonBoundingClientRect()
},
},
mounted() {
this.$nextTick(() => {

8
components/popupad.vue
View File

@@ -53,7 +53,6 @@
},
watch: {
forceUpdate(val,oldval) {
console.log(val,oldval)
// 在 forceUpdate 改变时执行更新操作
let time = uni.cache.get('popUpTime') ? new Date().getTime() - uni.cache.get('popUpTime') : 1000;
if ( time >= 1000 ) {
@@ -62,9 +61,9 @@
}
}
},
},
mounted () {
// if (uni.cache.get('shopUser') && uni.cache.get('token')) {
// if (uni.cache.get('shopId') && uni.cache.get('token')) {
// }
},
@@ -94,7 +93,7 @@
*/
async getPopUpAd () {
let res = await this.api.getPopUpAd({
shopId: uni.cache.get('shopUser')
shopId: uni.cache.get('shopId')
})
if (res.code == 0) {
this.popupadList = [];
@@ -141,6 +140,7 @@
// updateTime
}
this.viewswiperShow = false;
if ( this.popupadList.length > 0 ) {
this.viewswiperShow = true;
}

8
components/tki-barcode/tki-barcode.vue
View File

@@ -1,11 +1,11 @@
<template xlang="wxml" minapp="mpvue">
<view class="tki-barcode">
<!-- #ifndef MP-ALIPAY -->
<canvas class="tki-barcode-canvas" :canvas-id="cid"
<canvas class="tki-barcode-canvas 1" :canvas-id="cid"
:style="{width:canvasWidth+'px',height:canvasHeight+'px'}" />
<!-- #endif -->
<!-- #ifdef MP-ALIPAY -->
<canvas :id="cid" :width="canvasWidth" :height="canvasHeight" class="tki-barcode-canvas" />
<canvas :id="cid" :width="canvasWidth" :height="canvasHeight" class="tki-barcode-canvas 2" />
<!-- #endif -->
<image v-show="show" :src="result" :style="{width:canvasWidth+'px',height:canvasHeight+'px'}" />
</view>
@@ -83,6 +83,7 @@
onUnload: function() {},
methods: {
setval(n) {
console.log(n)
this.val = n
if (!this._empty(n)) {
setTimeout(() => {
@@ -166,7 +167,10 @@
},
watch: {
val(n, o) {
console.log(n,0)
console.log(this.onval)
if (this.onval) {
console.log(!this._empty(n))
if (n != o && !this._empty(n)) {
setTimeout(() => {
this._makeCode()