11

pages/billing/addUser.vue

@@ -117,7 +117,17 @@
 				this.formData.consigneeMobile = data.consigneeMobile || data.phone
 				this.formData.consigneeName = data.consigneeName || data.name
 			}
-
+			
+		},
+		onShow(){
+			uni.authorize({
+			    scope: 'scope.userLocation',
+			    success() {
+			        
+			    },fail(){
+					this.tui.toast("您未授权，AI入库功能可能会出现错误")
+				}
+			})
 		},
 		methods: {
 			//获取手机通讯录
@@ -210,10 +220,15 @@
 			},
 			openPicker() {
 				let that = this;
-				uni.chooseLocation({
-					success: function(res) {
-						if (res.name != '') {
-							let aaa = getArea(res.address)
+				uni.chooseLocation({
+					latitude:'38.335974',
+					longitude:'116.805783',
+					success: function(res) {
+						console.log('11111',res)
+						if (res.name != '') {
+							
+							let aaa = getArea(res.address)
+							console.log('2222',aaa)
 							that.formData.province = aaa.province
 							that.formData.city = aaa.city
 							that.formData.area = aaa.country

pages/index/index.vue

@@ -26,13 +26,19 @@
 					<view class="title-btn-sbtn" @tap="goSonPage('/pages/index/shareStyle')">
 						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/83b7267c23b242d888385d7397542122.jpg" alt="" class="title-img" />
 						<text>推款</text>
+					</view>
+					<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')">
+					<!-- <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" />
 						<text>待入库</text>
 						<text v-if="waitCount.waitPurchaseCount > 0"
 							class="red-circle">{{waitCount.waitPurchaseCount > 99 ? '99+' :waitCount.waitPurchaseCount}}</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class="waimai" @tap="quwaimai"></view>

pages/inventory/inventory.vue

@@ -10,6 +10,10 @@
 				<view class="title-left-box">
 					<text>{{warnMsg.salesWeekCount}}</text>
 					<text>尾货预警</text>
+				</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="shop-box">
@@ -165,7 +169,8 @@
 				categoryIndex:0,
 				windowHeight:0,
 				shopList1:[],
-				gateType:''
+				gateType:'',
+				total:0
 			}
 		},
 		onLoad(){
@@ -179,7 +184,8 @@
 		},
 		onShow() {
 			this.getGategoryList()
-			this.getWarnMsg()
+			this.getWarnMsg()
+			this.getweiruku()
 		},
 		methods: {
 			//初始化获取分类列表
@@ -225,6 +231,25 @@
 				}
 				this.categoryId = this.indexList[index].id
 				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) {
@@ -352,7 +377,10 @@
 					})
 					this.$refs.payDialog.close()
 				} else if (target == '1') {
-					this.$refs.popup.open('bottom')
+					// this.$refs.popup.open('bottom')
+					uni.navigateTo({
+						url: '/pages/inventory/addinventory'
+					})
 					
 				} else if (target == '2') {
 					uni.navigateTo({
@@ -396,7 +424,7 @@
 		display: flex;
 		flex-direction: column;
 		text-align: center;
-		width: 50%;
+		width: 33%;
 		height: 100rpx;
 		padding-top: 20rpx;
 

pages/login/login.vue

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