wangfukang 3 years ago
parent
commit
6287a0d3e3
  1. 15
      pages/billing/addUser.vue
  2. 10
      pages/index/index.vue
  3. 330
      pages/inventory/goodsList1.vue
  4. 34
      pages/inventory/inventory.vue
  5. 3
      pages/login/login.vue

15
pages/billing/addUser.vue

@ -119,6 +119,16 @@
} }
}, },
onShow(){
uni.authorize({
scope: 'scope.userLocation',
success() {
},fail(){
this.tui.toast("您未授权,AI入库功能可能会出现错误")
}
})
},
methods: { methods: {
//获取手机通讯录 //获取手机通讯录
getUserPhone() { getUserPhone() {
@ -211,9 +221,14 @@
openPicker() { openPicker() {
let that = this; let that = this;
uni.chooseLocation({ uni.chooseLocation({
latitude:'38.335974',
longitude:'116.805783',
success: function(res) { success: function(res) {
console.log('11111',res)
if (res.name != '') { if (res.name != '') {
let aaa = getArea(res.address) let aaa = getArea(res.address)
console.log('2222',aaa)
that.formData.province = aaa.province that.formData.province = aaa.province
that.formData.city = aaa.city that.formData.city = aaa.city
that.formData.area = aaa.country that.formData.area = aaa.country

10
pages/index/index.vue

@ -27,12 +27,18 @@
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/83b7267c23b242d888385d7397542122.jpg" alt="" class="title-img" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/83b7267c23b242d888385d7397542122.jpg" alt="" class="title-img" />
<text>推款</text> <text>推款</text>
</view> </view>
<view class="title-btn-sbtn" @tap="goSonPage('/pages/index/waitStorage?inStorageStatus=0')"> <view class="title-btn-sbtn" @tap="goSonPage('/package1/AI/AIInventoryList')">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/01c48cc06cfb4f44aa304fbc26df048c.jpg" alt="" class="title-img" />
<text>Ai入库</text>
<!-- <text v-if="waitCount.waitPurchaseCount > 0"
class="red-circle">{{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}}</text> -->
</view>
<!-- <view class="title-btn-sbtn" @tap="goSonPage('/pages/index/waitStorage?inStorageStatus=0')">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/01c48cc06cfb4f44aa304fbc26df048c.jpg" alt="" class="title-img" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/01c48cc06cfb4f44aa304fbc26df048c.jpg" alt="" class="title-img" />
<text>待入库</text> <text>待入库</text>
<text v-if="waitCount.waitPurchaseCount > 0" <text v-if="waitCount.waitPurchaseCount > 0"
class="red-circle">{{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}}</text> class="red-circle">{{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}}</text>
</view> </view> -->
</view> </view>
</view> </view>
<view class="waimai" @tap="quwaimai"></view> <view class="waimai" @tap="quwaimai"></view>

330
pages/inventory/goodsList1.vue

@ -10,8 +10,7 @@
<view class="content-list" @tap.stop="goPopleList('khName')"> <view class="content-list" @tap.stop="goPopleList('khName')">
<view class="list-name">客户</view> <view class="list-name">客户</view>
<view class="list-val"> <view class="list-val">
<input type="text" placeholder="请选择客户" disabled <input type="text" placeholder="请选择客户" disabled :value="khName.name"
:value="khName.name"
style="border-bottom: 1px solid #fff;text-align: center;"> style="border-bottom: 1px solid #fff;text-align: center;">
<uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons> <uni-icons type="right" size="16" style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
</view> </view>
@ -27,14 +26,16 @@
<uni-icons type="scan" size="12"></uni-icons> <uni-icons type="scan" size="12"></uni-icons>
<text>扫一扫</text> <text>扫一扫</text>
</view> </view>
<view @tap.stop="goodsAdd" style="width: 50%;text-align: center;line-height: 70rpx;border-left: 1px solid #eee;"> <view @tap.stop="goodsAdd"
style="width: 50%;text-align: center;line-height: 70rpx;border-left: 1px solid #eee;">
<uni-icons type="plusempty" size="12"></uni-icons> <uni-icons type="plusempty" size="12"></uni-icons>
<text>添加商品</text> <text>添加商品</text>
</view> </view>
</view> </view>
<view style="height: 150rpx;width: 100%;display: flex;" @tap="toggle('center',item)"> <view style="height: 150rpx;width: 100%;display: flex;" @tap="toggle('center',item)">
<view style="width: 70rpx;height: 70rpx;margin: 40rpx;display: block;overflow: hidden;"> <view style="width: 70rpx;height: 70rpx;margin: 40rpx;display: block;overflow: hidden;">
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/27e2655fe19f454d93970f968d91fbef.png" alt="" style="width: 100%;height: 100%;" /> <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/27e2655fe19f454d93970f968d91fbef.png"
alt="" style="width: 100%;height: 100%;" />
</view> </view>
<view style="padding-left: 11rpx;"> <view style="padding-left: 11rpx;">
<view style="height: 80rpx;font-size: 30rpx;font-weight: bold;line-height: 80rpx;"> <view style="height: 80rpx;font-size: 30rpx;font-weight: bold;line-height: 80rpx;">
@ -64,10 +65,12 @@
</view> </view>
<view v-if="value[1].supplierName !=undefined">供应商:{{value[1].supplierName}}</view> <view v-if="value[1].supplierName !=undefined">供应商:{{value[1].supplierName}}</view>
</view> </view>
<view @tap.stop="clickPrice(value[0])" style="position: absolute;top: 73rpx;right: 20rpx;color: blue;height: 60rpx;width: 80rpx;text-decoration: underline;line-height: 40rpx;"> <view @tap.stop="clickPrice(value[0])"
style="position: absolute;top: 73rpx;right: 20rpx;color: blue;height: 60rpx;width: 80rpx;text-decoration: underline;line-height: 40rpx;">
改价 改价
</view> </view>
<view @tap.stop="AiAddSpec(value[1])" style="position: absolute;bottom: 0;right: 44rpx;color: blue;height: 60rpx;text-decoration: underline;line-height: 40rpx;"> <view @tap.stop="AiAddSpec(value[1])"
style="position: absolute;bottom: 0;right: 44rpx;color: blue;height: 60rpx;text-decoration: underline;line-height: 40rpx;">
添加规格 添加规格
</view> </view>
<view @tap.stop="getHistoryPrice(value[1].productId,value[0])" <view @tap.stop="getHistoryPrice(value[1].productId,value[0])"
@ -75,7 +78,9 @@
style="position: absolute;top: 120rpx;right: 160rpx;"> style="position: absolute;top: 120rpx;right: 160rpx;">
<u-icon name="clock" size="20"></u-icon> <u-icon name="clock" size="20"></u-icon>
</view> </view>
<view style="position: absolute;top: 20rpx;height: 60rpx;width: 60rpx;line-height: 40rpx;right: 17rpx;" @tap.stop="delShop(value[0])"> <view
style="position: absolute;top: 20rpx;height: 60rpx;width: 60rpx;line-height: 40rpx;right: 17rpx;"
@tap.stop="delShop(value[0])">
<uni-icons color="red" type="trash" size="26"></uni-icons> <uni-icons color="red" type="trash" size="26"></uni-icons>
</view> </view>
</view> </view>
@ -101,19 +106,22 @@
</view> </view>
<view class="shop-checkList" v-if="value[1].stockLogList !=''"> <view class="shop-checkList" v-if="value[1].stockLogList !=''">
<view class="shop-checkList-box" style="width: 67%;"> <view class="shop-checkList-box" style="width: 67%;">
<text style="text-align:center;width: 400rpx;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;"> <text
style="text-align:center;width: 400rpx;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;">
规格 规格
</text> </text>
<text style="font-size: 30rpx;color: #000;font-weight: bold;width: 60rpx;display: inline-block;text-align: center;"> <text
style="font-size: 30rpx;color: #000;font-weight: bold;width: 60rpx;display: inline-block;text-align: center;">
库存 库存
</text> </text>
</view> </view>
<view style="font-size: 30rpx;color: #000;font-weight: bold;width: 152rpx;display: inline-block;text-align: right;"> <view
style="font-size: 30rpx;color: #000;font-weight: bold;width: 152rpx;display: inline-block;text-align: right;">
数量 数量
</view> </view>
</view> </view>
<view v-for="(values,keys) in Array.from(value[1].stockLogList)" <view v-for="(values,keys) in Array.from(value[1].stockLogList)" :key='keys'
:key='keys' :id="values[1].uuid"> :id="values[1].uuid">
<view class="shop-collapse"> <view class="shop-collapse">
<view @tap.stop="delShopSpec(value[0],values[0])"> <view @tap.stop="delShopSpec(value[0],values[0])">
<uni-icons color="red" type="minus" size="26"></uni-icons> <uni-icons color="red" type="minus" size="26"></uni-icons>
@ -124,9 +132,11 @@
<text @tap="checkSpec('尺码',value[0],values[0],numData(values[0])[1])"> <text @tap="checkSpec('尺码',value[0],values[0],numData(values[0])[1])">
{{numData(values[0])[1]}} {{numData(values[0])[1]}}
</text> </text>
<text style="width: 25%;font-size: 22rpx;">{{values[1].productNum == null ?'无库存':values[1].productNum}}</text> <text
style="width: 25%;font-size: 22rpx;">{{values[1].productNum == null ?'无库存':values[1].productNum}}</text>
<view style="text-align: left;padding-left: 5px;width:50%;display: flex;"> <view style="text-align: left;padding-left: 5px;width:50%;display: flex;">
<uni-number-box max="100000" style="margin-top:9rpx;border-right:0;" v-model="values[1].productCount" <uni-number-box max="100000" style="margin-top:9rpx;border-right:0;"
v-model="values[1].productCount"
@change="GoodsNumChange($event,value,values[0])" /> @change="GoodsNumChange($event,value,values[0])" />
</view> </view>
</view> </view>
@ -246,7 +256,8 @@
<view class="content-list" v-if="radioType == '4'" @tap.stop="goPopleList('fcName')"> <view class="content-list" v-if="radioType == '4'" @tap.stop="goPopleList('fcName')">
<view class="list-name" style="width:150rpx;padding-left:0;">选择车号</view> <view class="list-name" style="width:150rpx;padding-left:0;">选择车号</view>
<view class="list-val"> <view class="list-val">
<input type="text" placeholder="请选择" disabled :value="wlName.companyName || wlName.shippingMethod" <input type="text" placeholder="请选择" disabled
:value="wlName.companyName || wlName.shippingMethod"
style="border-bottom: 1px solid #fff;text-align: center;"> style="border-bottom: 1px solid #fff;text-align: center;">
<uni-icons type="right" size="16" <uni-icons type="right" size="16"
style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons> style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
@ -255,7 +266,8 @@
<view class="content-list" v-if="radioType == '5'" @tap.stop="goPopleList('dbName')"> <view class="content-list" v-if="radioType == '5'" @tap.stop="goPopleList('dbName')">
<view class="list-name" style="width:150rpx;padding-left:0;">选择车号</view> <view class="list-name" style="width:150rpx;padding-left:0;">选择车号</view>
<view class="list-val"> <view class="list-val">
<input type="text" placeholder="请选择" disabled :value="wlName.companyName || wlName.shippingMethod" <input type="text" placeholder="请选择" disabled
:value="wlName.companyName || wlName.shippingMethod"
style="border-bottom: 1px solid #fff;text-align: center;"> style="border-bottom: 1px solid #fff;text-align: center;">
<uni-icons type="right" size="16" <uni-icons type="right" size="16"
style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons> style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
@ -315,13 +327,14 @@
<text style="display: inline-block">批发价:¥{{wholesalePrice}}</text> <text style="display: inline-block">批发价:¥{{wholesalePrice}}</text>
</view> </view>
<view class="popup-pay-container" style="background: #fff;display: flex;width: 100%;"> <view class="popup-pay-container" style="background: #fff;display: flex;width: 100%;">
<input type="digit" style="height: 100rpx;line-height: 100rpx;color:#000;width: 296rpx;" placeholder="请输入价格" <input type="digit" style="height: 100rpx;line-height: 100rpx;color:#000;width: 296rpx;"
@input="changePay"> placeholder="请输入价格" @input="changePay">
<view style="flex: 1;color: #fff;background: #088FEB;border-radius: 10px;width: 144rpx;" <view style="flex: 1;color: #fff;background: #088FEB;border-radius: 10px;width: 144rpx;"
@tap.stop="checkPay(customPrice)">确定</view> @tap.stop="checkPay(customPrice)">确定</view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<canvas canvas-id="myCanvas"></canvas>
<!-- 弹出层 --> <!-- 弹出层 -->
<view class="tanchuceng"> <view class="tanchuceng">
<uni-popup ref="shopPopup" background-color="#fff" @change="allChangeNum = 0"> <uni-popup ref="shopPopup" background-color="#fff" @change="allChangeNum = 0">
@ -360,19 +373,24 @@
<view style="padding-bottom:100rpx;"> <view style="padding-bottom:100rpx;">
<view class="shop-checkList" v-if="temporaryList != ''"> <view class="shop-checkList" v-if="temporaryList != ''">
<view class="shop-checkList-box" style="width: 69.5%;"> <view class="shop-checkList-box" style="width: 69.5%;">
<text style="width: 300rpx;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;"> <text
style="width: 300rpx;display: inline-block;font-size: 30rpx;font-weight: bold;padding-left: 40rpx;">
规格 规格
</text> </text>
<text style="font-size: 30rpx;color: #000;font-weight: bold;width: 110rpx;display: inline-block;text-align: right;"> <text
style="font-size: 30rpx;color: #000;font-weight: bold;width: 110rpx;display: inline-block;text-align: right;">
库存 库存
</text> </text>
</view> </view>
<view class="zuni-numbox"> <view class="zuni-numbox">
<view @tap="minusNum" class="zuni-numbox__minus zuni-numbox-btns" style="background: #f5f5f5;"> <view @tap="minusNum" class="zuni-numbox__minus zuni-numbox-btns"
style="background: #f5f5f5;">
<text class="zuni-numbox--text">-</text> <text class="zuni-numbox--text">-</text>
</view> </view>
<input v-model="allChangeNum" @blur="allChange" class="zuni-numbox__value" type="number" /> <input v-model="allChangeNum" @blur="allChange" class="zuni-numbox__value"
<view @tap="plusNum" class="zuni-numbox__plus zuni-numbox-btns" style="background: #f5f5f5;"> type="number" />
<view @tap="plusNum" class="zuni-numbox__plus zuni-numbox-btns"
style="background: #f5f5f5;">
<text class="zuni-numbox--text">+</text> <text class="zuni-numbox--text">+</text>
</view> </view>
</view> </view>
@ -386,7 +404,8 @@
<text style="width: 300rpx;display: inline-block;">{{item.name}}</text> <text <text style="width: 300rpx;display: inline-block;">{{item.name}}</text> <text
style="color:#777;font-size: 12px;">{{item.productNum==null?'无库存':item.productNum}}</text> style="color:#777;font-size: 12px;">{{item.productNum==null?'无库存':item.productNum}}</text>
</view> </view>
<uni-number-box max='1000000' v-model="item.productCount" @change="temporaryChange($event,item)" /> <uni-number-box max='1000000' v-model="item.productCount"
@change="temporaryChange($event,item)" />
</view> </view>
</view> </view>
</view> </view>
@ -437,8 +456,8 @@
语音示例:货号02-37,白色M码,10件 语音示例:货号02-37,白色M码,10件
</view> </view>
<view class="voice-popup-container"> <view class="voice-popup-container">
<textarea name="" id="" style="width:100%;height:300rpx;border:1px solid #eee;margin:0;" v-model="voiceText" <textarea name="" id="" style="width:100%;height:300rpx;border:1px solid #eee;margin:0;"
placeholder="等待语音识别中..."></textarea> v-model="voiceText" placeholder="等待语音识别中..."></textarea>
<view> <view>
<text style="color:red;font-size:22rpx;">*长按“语音”按钮录入,系统将自动识别</text> <text style="color:red;font-size:22rpx;">*长按“语音”按钮录入,系统将自动识别</text>
</view> </view>
@ -483,8 +502,10 @@
style="width:50%;line-height: 100rpx;text-align: center;border-right: 1px solid #eee;"> style="width:50%;line-height: 100rpx;text-align: center;border-right: 1px solid #eee;">
仅开单 仅开单
</view> </view>
<view style="position:relative;width:50%;line-height: 100rpx;text-align: center;border-right: 1px solid #eee;"> <view
<kk-printer style="width: 100%;color:#fff;position: absolute;top: 0;left: 0;" ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint" :defaultText="'开单并打印'"></kk-printer> style="position:relative;width:50%;line-height: 100rpx;text-align: center;border-right: 1px solid #eee;">
<kk-printer style="width: 100%;color:#fff;position: absolute;top: 0;left: 0;" ref="kkprinter"
:bufferData="bufferData" @onPrint="onPrint" :defaultText="'开单并打印'"></kk-printer>
</view> </view>
</view> </view>
@ -499,11 +520,13 @@
<view style="border-bottom: 1px solid #eee;" v-if="aiNotRecognition != ''"> <view style="border-bottom: 1px solid #eee;" v-if="aiNotRecognition != ''">
<view style="margin-top:20rpx;">抱歉:小助手对“{{getMsg}}”的部分商品未识别,请检查识别信息是否正确:</view> <view style="margin-top:20rpx;">抱歉:小助手对“{{getMsg}}”的部分商品未识别,请检查识别信息是否正确:</view>
<view class="box-right" style="margin: 20rpx 0 20rpx;text-align: left;width: 100%;"> <view class="box-right" style="margin: 20rpx 0 20rpx;text-align: left;width: 100%;">
<text class="box-right-name" style="font-size: 24rpx;padding: 20rpx 0;">{{aiNotRecognition}}</text> <text class="box-right-name"
style="font-size: 24rpx;padding: 20rpx 0;">{{aiNotRecognition}}</text>
</view> </view>
</view> </view>
<view style="margin-bottom:140rpx;"> <view style="margin-bottom:140rpx;">
<view v-if="noList != ''" style="height: 60rpx;line-height: 60rpx;text-align: center;font-weight: 800;">以下商品-规格未入库</view> <view v-if="noList != ''"
style="height: 60rpx;line-height: 60rpx;text-align: center;font-weight: 800;">以下商品-规格未入库</view>
<view v-for="(item,index) in noList" :key="index"> <view v-for="(item,index) in noList" :key="index">
<view class="box-right" style="margin: 20rpx 0;text-align: center;width: 100%;"> <view class="box-right" style="margin: 20rpx 0;text-align: center;width: 100%;">
<text class="box-right-name" style="font-size: 24rpx;padding: 20rpx 0;">{{item}}</text> <text class="box-right-name" style="font-size: 24rpx;padding: 20rpx 0;">{{item}}</text>
@ -532,7 +555,8 @@
</view> </view>
<view class="content-fur"> <view class="content-fur">
<view class="content-low" v-for="item in attributeValue" :key="item.id" <view class="content-low" v-for="item in attributeValue" :key="item.id"
@tap="changeSpec(item.value)" v-if="temporary[3] != item.value">{{item.value}}</view> @tap="changeSpec(item.value)" v-if="temporary[3] != item.value">{{item.value}}
</view>
</view> </view>
</li> </li>
</ul> </ul>
@ -546,7 +570,9 @@
import util from '@/components/kk-printer/utils/util.js'; import util from '@/components/kk-printer/utils/util.js';
import * as blesdk from '@/components/kk-printer/utils/bluetoolth.js'; import * as blesdk from '@/components/kk-printer/utils/bluetoolth.js';
import kkPrinter from '@/components/kk-printer/index.vue'; import kkPrinter from '@/components/kk-printer/index.vue';
import { generateUUID } from '@/utils/global.js' import {
generateUUID
} from '@/utils/global.js'
import base from '@/utils/ossUploadFile/base64.js'; import base from '@/utils/ossUploadFile/base64.js';
var plugin = requirePlugin("WechatSI") var plugin = requirePlugin("WechatSI")
let manager = plugin.getRecordRecognitionManager() let manager = plugin.getRecordRecognitionManager()
@ -684,7 +710,9 @@
}, },
onShow() { onShow() {
// 初始化蓝牙模块 // 初始化蓝牙模块
wx.openBluetoothAdapter({mode: 'central'}) wx.openBluetoothAdapter({
mode: 'central'
})
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}) })
@ -788,7 +816,9 @@
var data1 = { var data1 = {
productCount: this.carList1[i].saleDetailQueryDTO[m].productCount, productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
name: this.carList1[i].saleDetailQueryDTO[m].name, name: this.carList1[i].saleDetailQueryDTO[m].name,
productNum:this.carList1[i].saleDetailQueryDTO[m].productNum != undefined?this.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i].saleDetailQueryDTO[m].stockCount productNum: this.carList1[i].saleDetailQueryDTO[m].productNum != undefined ? this
.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i]
.saleDetailQueryDTO[m].stockCount
} }
obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1) obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
@ -803,12 +833,17 @@
m].attributeList) == true) { //规格相同 m].attributeList) == true) { //规格相同
var data1 = { var data1 = {
productCount: this.carList.get(this.carList1[i].id).stockLogList.get(this.carList1[i].saleDetailQueryDTO[m].attributeList).productCount + this.carList1[i].saleDetailQueryDTO[m].productCount, productCount: this.carList.get(this.carList1[i].id).stockLogList.get(this
.carList1[i].saleDetailQueryDTO[m].attributeList).productCount +
this.carList1[i].saleDetailQueryDTO[m].productCount,
name: this.carList1[i].saleDetailQueryDTO[m].name, name: this.carList1[i].saleDetailQueryDTO[m].name,
productNum:this.carList1[i].saleDetailQueryDTO[m].productNum != undefined?this.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i].saleDetailQueryDTO[m].stockCount productNum: this.carList1[i].saleDetailQueryDTO[m].productNum !=
undefined ? this.carList1[i].saleDetailQueryDTO[m].productNum : this
.carList1[i].saleDetailQueryDTO[m].stockCount
} }
this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1) this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i]
.saleDetailQueryDTO[m].attributeList, data1)
// this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i] // this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i]
// .saleDetailQueryDTO[m].attributeList, this.carList.get(this.carList1[i].id).stockLogList.get( // .saleDetailQueryDTO[m].attributeList, this.carList.get(this.carList1[i].id).stockLogList.get(
@ -827,12 +862,16 @@
var data1 = { var data1 = {
productCount: this.carList1[i].saleDetailQueryDTO[m].productCount, productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
name: this.carList1[i].saleDetailQueryDTO[m].name, name: this.carList1[i].saleDetailQueryDTO[m].name,
productNum:this.carList1[i].saleDetailQueryDTO[m].productNum != undefined?this.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i].saleDetailQueryDTO[m].stockCount productNum: this.carList1[i].saleDetailQueryDTO[m].productNum !=
undefined ? this.carList1[i].saleDetailQueryDTO[m].productNum : this
.carList1[i].saleDetailQueryDTO[m].stockCount
} }
this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i].saleDetailQueryDTO[ this.carList.get(this.carList1[i].id).stockLogList.set(this.carList1[i]
.saleDetailQueryDTO[
m].attributeList, data1) m].attributeList, data1)
} }
this.carList.get(this.carList1[i].id).productCount += this.carList1[i].saleDetailQueryDTO[ this.carList.get(this.carList1[i].id).productCount += this.carList1[i]
.saleDetailQueryDTO[
m].productCount m].productCount
} }
} else { //商品不同 } else { //商品不同
@ -862,7 +901,9 @@
var data1 = { var data1 = {
productCount: this.carList1[i].saleDetailQueryDTO[m].productCount, productCount: this.carList1[i].saleDetailQueryDTO[m].productCount,
name: this.carList1[i].saleDetailQueryDTO[m].name, name: this.carList1[i].saleDetailQueryDTO[m].name,
productNum:this.carList1[i].saleDetailQueryDTO[m].productNum != undefined?this.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i].saleDetailQueryDTO[m].stockCount productNum: this.carList1[i].saleDetailQueryDTO[m].productNum != undefined ?
this.carList1[i].saleDetailQueryDTO[m].productNum : this.carList1[i]
.saleDetailQueryDTO[m].stockCount
} }
obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1) obj.stockLogList.set(this.carList1[i].saleDetailQueryDTO[m].attributeList, data1)
@ -961,12 +1002,15 @@
m].attributeList) == true) { //规格相同 m].attributeList) == true) { //规格相同
var data1 = { var data1 = {
productCount: this.carList.get(this.carList1[i].productId).stockLogList.get(this.carList1[i].stockLogList1[m].attributeList).productCount + this.carList1[i].stockLogList1[m].productCount, productCount: this.carList.get(this.carList1[i].productId).stockLogList
.get(this.carList1[i].stockLogList1[m].attributeList).productCount +
this.carList1[i].stockLogList1[m].productCount,
name: this.sliceMsg(this.carList1[i].stockLogList1[m].attributeList), name: this.sliceMsg(this.carList1[i].stockLogList1[m].attributeList),
productNum: this.carList1[i].stockLogList1[m].stockCount productNum: this.carList1[i].stockLogList1[m].stockCount
} }
this.carList.get(this.carList1[i].productId).stockLogList.set(this.carList1[i].stockLogList1[m].attributeList, data1) this.carList.get(this.carList1[i].productId).stockLogList.set(this.carList1[i]
.stockLogList1[m].attributeList, data1)
} else { //规格不同 } else { //规格不同
var data1 = { var data1 = {
@ -974,10 +1018,12 @@
name: this.sliceMsg(this.carList1[i].stockLogList1[m].attributeList), name: this.sliceMsg(this.carList1[i].stockLogList1[m].attributeList),
productNum: this.carList1[i].stockLogList1[m].stockCount productNum: this.carList1[i].stockLogList1[m].stockCount
} }
this.carList.get(this.carList1[i].productId).stockLogList.set(this.carList1[i].stockLogList1[ this.carList.get(this.carList1[i].productId).stockLogList.set(this.carList1[i]
.stockLogList1[
m].attributeList, data1) m].attributeList, data1)
} }
this.carList.get(this.carList1[i].productId).productCount += this.carList1[i].stockLogList1[ this.carList.get(this.carList1[i].productId).productCount += this.carList1[i]
.stockLogList1[
m].productCount m].productCount
} }
} else { //商品不同 } else { //商品不同
@ -1033,7 +1079,8 @@
value.unitPrice = value.wholesalePrice value.unitPrice = value.wholesalePrice
} }
if (that.discountType == 1) { //整体折扣 if (that.discountType == 1) { //整体折扣
value.price = value.unitPrice * 10000 * value.productCount * that.discountNum / 10 / 10000 value.price = value.unitPrice * 10000 * value.productCount * that.discountNum /
10 / 10000
} }
}) })
this.getAllPrice() this.getAllPrice()
@ -1435,11 +1482,31 @@
}, },
convertChineseToArabic(str) { convertChineseToArabic(str) {
const chineseNumToArabic = { const chineseNumToArabic = {
'零': 0, '一': 1, '二': 2, '两': 2, '三': 3, '零': 0,
'四': 4, '五': 5, '六': 6, '七': 7, '八': 8, '一': 1,
'九': 9,'杠':'-','刚':'-','军色':'均色','叉':'X','金色':'均色','井':'#', '二': 2,
'时间':'10件','事件':'10件','世间':'10件','实践':'10件','实件':'10件', '两': 2,
'景':'#','警':'#','颈':'#', '三': 3,
'四': 4,
'五': 5,
'六': 6,
'七': 7,
'八': 8,
'九': 9,
'杠': '-',
'刚': '-',
'军色': '均色',
'叉': 'X',
'金色': '均色',
'井': '#',
'时间': '10件',
'事件': '10件',
'世间': '10件',
'实践': '10件',
'实件': '10件',
'景': '#',
'警': '#',
'颈': '#',
}; };
const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈)/g; const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚|军色|叉|金色|井|时间|事件|世间|实践|实件|景|警|颈)/g;
return str.replace(regex, match => chineseNumToArabic[match]); return str.replace(regex, match => chineseNumToArabic[match]);
@ -1471,7 +1538,8 @@
newList.push(res.result.data[i].stockLogList1[m]) newList.push(res.result.data[i].stockLogList1[m])
} else { } else {
// res.result.data[i].productCount = res.result.data[i].productCount - res.result.data[i].stockLogList1[m].productCount // res.result.data[i].productCount = res.result.data[i].productCount - res.result.data[i].stockLogList1[m].productCount
this.noList.push(res.result.data[i].productName+'-'+ res.result.data[i].stockLogList1[m].attributeList) this.noList.push(res.result.data[i].productName + '-' + res.result.data[i]
.stockLogList1[m].attributeList)
} }
} }
@ -1748,9 +1816,11 @@
let oldValue = [] let oldValue = []
for (var m = 0; m < this.goodsDetail.attributeList[i].value for (var m = 0; m < this.goodsDetail.attributeList[i].value
.length; m++) { .length; m++) {
if (this.goodsDetail.attributeList[i].value[m].isChecked == true) { if (this.goodsDetail.attributeList[i].value[m].isChecked ==
true) {
oldCheck = true oldCheck = true
oldValue.push(this.goodsDetail.attributeList[i].value[m].value) oldValue.push(this.goodsDetail.attributeList[i].value[
m].value)
} }
} }
let specs1 = { let specs1 = {
@ -2314,7 +2384,8 @@
} }
value.stockLogList.forEach(function(value1, key1) { value.stockLogList.forEach(function(value1, key1) {
if (that.countPrint() < that.printTotal) { if (that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLText('0', that.yNum, '24', '0', 0, '□ '+(that.slicePrint( strCmd += blesdk.addCPCLText('0', that.yNum, '24', '0', 0, '□ ' + (that
.slicePrint(
key1)) + '*' + value1.productCount) key1)) + '*' + value1.productCount)
strCmd += blesdk.addCPCLText('240', that.yNum, '24', '0', 0, '单价:' + value strCmd += blesdk.addCPCLText('240', that.yNum, '24', '0', 0, '单价:' + value
.discountAmount) .discountAmount)
@ -2336,7 +2407,7 @@
} }
}) })
}) })
if (that.countPrint() < this.printTotal) { if (that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
'===============================================================') '===============================================================')
} else { } else {
@ -2350,7 +2421,7 @@
'===============================================================') '===============================================================')
} }
if (that.countPrint() < this.printTotal) { if (that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '总数量:' + this.totalAmount) strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '总数量:' + this.totalAmount)
strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '总金额:' + this.shouldPay) strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '总金额:' + this.shouldPay)
strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.relPrice) strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.relPrice)
@ -2366,9 +2437,10 @@
strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.relPrice) strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.relPrice)
} }
if (that.countPrint() < this.printTotal) { if (that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '实收:' + this.priceOk) strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '实收:' + this.priceOk)
strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.relPrice - this.priceOk).toFixed(2)) strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.relPrice - this.priceOk)
.toFixed(2))
strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.otherExpense == '' ? 0 : strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.otherExpense == '' ? 0 :
this.otherExpense)) this.otherExpense))
} else { } else {
@ -2379,12 +2451,13 @@
strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0); strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
strCmd += blesdk.addCPCLLocation(0); strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLText('0', (this.yNum += 30), '24', '0', 0, '实收:' + this.priceOk) strCmd += blesdk.addCPCLText('0', (this.yNum += 30), '24', '0', 0, '实收:' + this.priceOk)
strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.relPrice - this.priceOk).toFixed(2)) strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.relPrice - this.priceOk)
.toFixed(2))
strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.otherExpense == '' ? 0 : strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.otherExpense == '' ? 0 :
this.otherExpense)) this.otherExpense))
} }
if (Math.ceil(Number(this.remark.length) / 20) * 30 + this.yNum < this.printTotal) { if (Math.ceil(Number(this.remark.length) / 20) * 30 + this.yNum < that.printTotal) {
if (this.remark.length > 20) { if (this.remark.length > 20) {
let position = 20; let position = 20;
let part1 = this.remark.substring(0, position); let part1 = this.remark.substring(0, position);
@ -2394,9 +2467,7 @@
} else { } else {
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.remark) strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.remark)
} }
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLPrint();
this.bufferData.push(strCmd);
} else { } else {
this.yNum = 0 this.yNum = 0
strCmd += blesdk.addCPCLLocation(0); strCmd += blesdk.addCPCLLocation(0);
@ -2416,11 +2487,106 @@
strCmd += blesdk.addCPCLLocation(0); strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.remark) strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + this.remark)
} }
strCmd += blesdk.addCPCLLocation(0); }
if (that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
'===============================================================')
} else {
this.yNum = 0
strCmd += blesdk.addCPCLPrint(); strCmd += blesdk.addCPCLPrint();
this.bufferData.push(strCmd);
strCmd = ''
strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
'===============================================================')
}
//店铺地址
if (that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '店铺地址:' + uni.getStorageSync(
'shopAddress'))
} else {
this.yNum = 0
strCmd += blesdk.addCPCLPrint();
this.bufferData.push(strCmd); this.bufferData.push(strCmd);
strCmd = ''
strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '店铺地址:' + uni.getStorageSync(
'shopAddress'))
} }
//店铺电话
if (that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, '店铺电话:' + uni.getStorageSync(
'username'))
} else {
that.yNum = 0
strCmd += blesdk.addCPCLPrint();
that.bufferData.push(strCmd);
strCmd = ''
strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLText('0', (that.yNum += 30), '24', '0', 0, '店铺电话:' + uni.getStorageSync(
'username'))
}
let ctx = uni.createCanvasContext('myCanvas')
ctx.clearRect(0, 0, 608, 1040)
uni.getStorage({
key: 'shopIcon',
success: function (res) {
console.log('哈哈哈1',res.data)
ctx.drawImage(res.data, 0, 0, 150, 150)
ctx.draw(false, () => {
console.log('哈哈哈',res.data)
uni.canvasGetImageData({
canvasId: 'myCanvas',
x: 0, y: 0,
width: 150,
height: 150,
success: async function(res1) {
console.log('哈哈哈2',res1.data)
// let pixData = {
// width: 304,
// height: 128,
// imageData: res.data,
// threshold: 190
// };
//店铺二维码
if (await that.countPrint() < that.printTotal) {
strCmd += blesdk.addCPCLImageCmd('0', that.countPrint(), {
threshold: 190,
width: 200,
height: 200,
imageData: res.data
})
console.log('strCmd',strCmd)
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLPrint();
that.bufferData.push(strCmd);
} else {
that.yNum = 0
strCmd += blesdk.addCPCLPrint();
that.bufferData.push(strCmd);
strCmd = ''
strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLImageCmd('0', (that.yNum += 30), {
threshold: 180,
width: 200,
height: 200,
imageData: res1.data
})
console.log('strCmd1',strCmd)
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLPrint();
that.bufferData.push(strCmd);
}
},
});
})
}
});
uni.hideLoading(); uni.hideLoading();
this.$nextTick(() => { this.$nextTick(() => {
@ -2432,6 +2598,18 @@
}); });
}) })
}, },
getImageInfo(imageSrc) {
let that = this
return new Promise((resolve, reject) => {
uni.getImageInfo({
src: imageSrc,
success(res) {
// console.log("uni.getImageInfo", res)
resolve(res)
}
})
})
},
//计算打印机当前行高度 //计算打印机当前行高度
countPrint() { countPrint() {
if ((this.yNum + 50) >= 1040) { if ((this.yNum + 50) >= 1040) {
@ -2535,7 +2713,8 @@
content: "确定删除此条规格吗?", content: "确定删除此条规格吗?",
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name).productCount; that.carList.get(id).productCount -= that.carList.get(id).stockLogList.get(name)
.productCount;
that.carList.get(id).stockLogList.delete(name); that.carList.get(id).stockLogList.delete(name);
that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get( that.carList.get(id).price = that.carList.get(id).productCount * that.carList.get(
id).unitPrice id).unitPrice
@ -2573,14 +2752,16 @@
this.carList.get(index[0]).stockLogList.get(index1).productCount = e this.carList.get(index[0]).stockLogList.get(index1).productCount = e
this.carList.get(index[0]).productCount = 0 this.carList.get(index[0]).productCount = 0
this.carList.get(index[0]).stockLogList.forEach(function(value, key) { this.carList.get(index[0]).stockLogList.forEach(function(value, key) {
that.carList.get(index[0]).productCount = that.carList.get(index[0]).productCount + value.productCount that.carList.get(index[0]).productCount = that.carList.get(index[0]).productCount + value
.productCount
if (that.discountType == 0) { //单品折扣 if (that.discountType == 0) { //单品折扣
// that.carList.get(index[0]).price = that.carList.get(index[0]).productCount * (that.carList.get( // that.carList.get(index[0]).price = that.carList.get(index[0]).productCount * (that.carList.get(
// index[0]).discountAmount * (that.carList.get(index[0]).discount / 10)) // index[0]).discountAmount * (that.carList.get(index[0]).discount / 10))
// that.carList.get(index[0]).price = that.carList.get(index[0]).price.toFixed(2) // that.carList.get(index[0]).price = that.carList.get(index[0]).price.toFixed(2)
// console.log(that.carList.get(index[0]).price) // console.log(that.carList.get(index[0]).price)
} else { } else {
that.carList.get(index[0]).price = that.carList.get(index[0]).productCount * that.carList.get(index[0]).unitPrice that.carList.get(index[0]).price = that.carList.get(index[0]).productCount * that.carList
.get(index[0]).unitPrice
} }
}) })
that.getAllPrice() that.getAllPrice()
@ -2857,7 +3038,7 @@
.bottom-box { .bottom-box {
width: 100%; width: 100%;
position: absolute; position: fixed;
bottom: 0rpx; bottom: 0rpx;
display: flex; display: flex;
background: #fff; background: #fff;
@ -3109,22 +3290,27 @@
color: #777; color: #777;
background: #eee; background: #eee;
} }
.list-val { .list-val {
.uni-data-select { .uni-data-select {
text-align: left; text-align: left;
} }
.uni-select__input-text { .uni-select__input-text {
padding-left: 120rpx; padding-left: 120rpx;
} }
.uni-select__selector { .uni-select__selector {
position: absolute; position: absolute;
left: 0; left: 0;
top: -240rpx top: -240rpx
} }
.uni-popper__arrow { .uni-popper__arrow {
display: none; display: none;
} }
.uni-select__selector-item text { .uni-select__selector-item text {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
@ -3192,6 +3378,7 @@
height: 200rpx; height: 200rpx;
margin: 0 auto; margin: 0 auto;
} }
.voice-btn { .voice-btn {
position: absolute; position: absolute;
bottom: -250rpx; bottom: -250rpx;
@ -3201,6 +3388,7 @@
background: #eee; background: #eee;
border-radius: 50%; border-radius: 50%;
} }
.type-popup { .type-popup {
width: 500rpx; width: 500rpx;
height: auto; height: auto;
@ -3209,6 +3397,7 @@
position: relative; position: relative;
margin-bottom: 40rpx; margin-bottom: 40rpx;
} }
.card-list { .card-list {
width: 95%; width: 95%;
border-radius: 10upx; border-radius: 10upx;
@ -3241,10 +3430,12 @@
color: #777; color: #777;
margin: 20rpx 0 0 20rpx; margin: 20rpx 0 0 20rpx;
} }
.scroll-content { .scroll-content {
padding-top: 388rpx; padding-top: 388rpx;
height: 90%; height: 90%;
} }
.kucun { .kucun {
background: url(https://jewel-shop.oss-cn-beijing.aliyuncs.com/9428d632981647728829da336a1d24b3.png) no-repeat; background: url(https://jewel-shop.oss-cn-beijing.aliyuncs.com/9428d632981647728829da336a1d24b3.png) no-repeat;
width: 50rpx; width: 50rpx;
@ -3254,6 +3445,7 @@
right: -15rpx; right: -15rpx;
background-size: 100%; background-size: 100%;
} }
.zuni-numbox { .zuni-numbox {
height: 60rpx; height: 60rpx;
display: flex; display: flex;

34
pages/inventory/inventory.vue

@ -11,6 +11,10 @@
<text>{{warnMsg.salesWeekCount}}</text> <text>{{warnMsg.salesWeekCount}}</text>
<text>尾货预警</text> <text>尾货预警</text>
</view> </view>
<view class="title-left-box" style="color:blue;text-decoration: underline;" @tap="goRuku">
<text>{{total}}</text>
<text>待入库</text>
</view>
<view class="title-left-box" style="flex-direction: inherit;width: 66%;"> <view class="title-left-box" style="flex-direction: inherit;width: 66%;">
<view class="shop-box"> <view class="shop-box">
<view>{{warnMsg.productCount}}</view> <view>{{warnMsg.productCount}}</view>
@ -165,7 +169,8 @@
categoryIndex:0, categoryIndex:0,
windowHeight:0, windowHeight:0,
shopList1:[], shopList1:[],
gateType:'' gateType:'',
total:0
} }
}, },
onLoad(){ onLoad(){
@ -180,6 +185,7 @@
onShow() { onShow() {
this.getGategoryList() this.getGategoryList()
this.getWarnMsg() this.getWarnMsg()
this.getweiruku()
}, },
methods: { methods: {
//初始化获取分类列表 //初始化获取分类列表
@ -226,6 +232,25 @@
this.categoryId = this.indexList[index].id this.categoryId = this.indexList[index].id
this.getShareList() this.getShareList()
}, },
//待入库
goRuku(){
uni.navigateTo({
url: '/pages/index/waitStorage?inStorageStatus=0'
})
},
getweiruku(){
this.tui.request("/app/purchase/list", "POST", {
inStorageStatus: 0
}, false, false).then((res) => {
this.status = 'nomore';
if (res.code == 200) {
this.total = res.result.total
} else {
this.tui.toast(res.message)
}
})
},
//入库单详情 //入库单详情
goDetail(item) { goDetail(item) {
uni.navigateTo({ uni.navigateTo({
@ -352,7 +377,10 @@
}) })
this.$refs.payDialog.close() this.$refs.payDialog.close()
} else if (target == '1') { } else if (target == '1') {
this.$refs.popup.open('bottom') // this.$refs.popup.open('bottom')
uni.navigateTo({
url: '/pages/inventory/addinventory'
})
} else if (target == '2') { } else if (target == '2') {
uni.navigateTo({ uni.navigateTo({
@ -396,7 +424,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
text-align: center; text-align: center;
width: 50%; width: 33%;
height: 100rpx; height: 100rpx;
padding-top: 20rpx; padding-top: 20rpx;

3
pages/login/login.vue

@ -253,6 +253,9 @@
uni.setStorageSync('type',item.type) uni.setStorageSync('type',item.type)
uni.setStorageSync('shopId',item.shopId) uni.setStorageSync('shopId',item.shopId)
uni.setStorageSync('shopName',item.shopName) uni.setStorageSync('shopName',item.shopName)
uni.setStorageSync('shopIcon',res.result.shopIcon)
uni.setStorageSync('shopAddress',res.result.shopAddress)
uni.setStorageSync('shopRemark',res.result.remark)
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'

Loading…
Cancel
Save