优化

manifest.json

@@ -3,8 +3,8 @@
     // "appid" : "__UNI__EDB6A1F",
     "appid" : "__UNI__EDB6A1F",
     "description" : "订货系统",
-    "versionName" : "1.1.42",
-    "versionCode" : "10142",
+    "versionName" : "1.1.44",
+    "versionCode" : "10144",
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -46,7 +46,7 @@
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             "ios" : {
                 "dSYMs" : false,

pages.json

@@ -352,7 +352,21 @@
 					}
 				}
 			}
-		}, {
+		},{
+			"path": "pages/select-all-customer/select-all-customer",
+			"style": {
+				"app-plus": {
+					"titleNView": {
+						"titleAlign": "left",
+						"titleColor": "#333",
+						"titleSize": "17px",
+						"backgroundColor": "#fff",
+						"titleText": "分流经销商",
+						"autoBackButton": true
+					}
+				}
+			}
+		},{
 			"path": "pages/select-shunt-list/select-shunt-list",
 			"style": {
 				"app-plus": {
@@ -1191,12 +1205,12 @@
 				"selectedIconPath": "static/image/tab_purchase_red@3x.png",
 				"text": "要货"
 			},
-			{
-				"pagePath": "pages/message/message",
-				"iconPath": "static/image/tab_message@3x.png",
-				"selectedIconPath": "static/image/tab_message_red@3x.png",
-				"text": "消息"
-			},
+			// {
+			// 	"pagePath": "pages/message/message",
+			// 	"iconPath": "static/image/tab_message@3x.png",
+			// 	"selectedIconPath": "static/image/tab_message_red@3x.png",
+			// 	"text": "消息"
+			// },
 			{
 				"pagePath": "pages/usercenter/usercenter",
 				"iconPath": "static/image/tab_my@3x.png",

pages/home/home.vue

@@ -159,7 +159,7 @@
 				
 			</swiper>
 		</view>
-		<view class="uni-margin-wrap">
+		<view class="uni-margin-wrap" style="padding: 20px 10px;">
 			<view class="swiper-title">
 				<text class="item-block__label">红包活动看板</text>
 				<text class="item-block__label item-more" @click="entryHandle('out-web-site')">查看更多 ></text>
@@ -300,7 +300,7 @@
 			this.queryProducts()
 			this.queryUnique()
 			this.pointsAndCashSummary()
-			this.getMessageList()
+			// this.getMessageList()
 		},
 		methods: {
 			async getMessageList() {

pages/my-purchase/order-item.nvue

@@ -242,7 +242,8 @@
 				// 获取arraybuffer格式数据
 				let res = await uni.request({
 					method: "POST",
-					url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
+					url: `https://crm.wuliangye.com.cn/crm-app/attachmentDownFile?id=`+item.id, //生产
+					// url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
 					params: {
 					  id: item.id
 					},

pages/out-web-site/out-web-site.vue

@@ -13,7 +13,7 @@
 	export default {
 		data() {
 			return {
-				src: 'https://www.baidu.com',
+				src: '',
 				webview_styles: {
 				}
 			}
@@ -32,7 +32,17 @@
 		methods: {
 			async getClientByApp(){
 				const res = await getClientByApp({code: this.userInfo.code})
+				if(res){
 					this.src = 'https://yingxiao.wuliangye.com.cn/webroot/login/jxsLogin.html?'+res
+				}else{
+					uni.showToast({
+						title: '权限校验不通过',
+						duration: 2000,
+						icon: 'none'
+					});
+					return
+				}
+				
 			},
 			message(event) {
 				console.log(JSON.stringify(event.detail));

pages/purchase-receive/purchase-receive.nvue

@@ -184,12 +184,14 @@
 		webUploadFile,
 		doDeleteFile,
 		doQuery, 
-		attachmentDownFile
+		attachmentDownFile,
+		findShuntAnyByDealer
 	} from '@/servers/purchaseList.js'
 	import { pathToBase64, base64ToPath } from 'image-tools'
 	export default {
 		data() {
 			return {
+				isRadio: false,
 				receiveUnitArr: [],
 				shuntArr: [],
 				shuntTypeArr: [],
@@ -228,6 +230,8 @@
 					this.orderItem.shuntDealer = ''
 					this.orderItem.shuntDealerName = ''
 					this.orderItem.shuntTypeName = ''
+				}else{
+					//this.getShuntAnyByDealer()
 				}
 			}
 		},
@@ -280,6 +284,11 @@
 				_this.orderItem.shuntChannelsType =  data.selectShuntAccountInfo.channels
 				_this.orderItem.shuntTypeName =  data.selectShuntAccountInfo.channelsTextView
 			})
+			uni.$on('selectAllShuntCode', function(data) {
+				console.log('监听到事件来自 selectAllShuntCode：', data);
+				_this.orderItem.shuntDealerName = data.selectAllShuntCode.info.partner
+				_this.orderItem.shuntDealer = data.selectAllShuntCode.info.partner
+			})
 			uni.$on('selectShuntAdressAccountInfo', function(data) {
 				console.log('监听到事件来自 selectShuntAdressAccountInfo ，携带参数 msg 为：', data);
 				_this.orderItem.shuntReceiveUnitName = data.selectShuntAdressAccountInfo.PARTNER_NAME
@@ -305,11 +314,13 @@
 			uni.$off('selectShuntAccountInfo')
 			uni.$off('selectShuntAdressAccountInfo')
 			uni.$off('selectShuntCode')
+			uni.$off('selectAllShuntCode')
 		},
 		beforeDestroy() {
 			uni.$off('selectShuntAccountInfo')
 			uni.$off('selectShuntAdressAccountInfo')
 			uni.$off('selectShuntCode')
+			uni.$off('selectAllShuntCode')
 		},
 		created() {
 			// 是否分流：B0099
@@ -320,6 +331,10 @@
 			// this.queryData()
 		},
 		methods: {
+			async getShuntAnyByDealer(){
+				const res = await findShuntAnyByDealer({customerCode: this.userInfo.code})
+				this.isRadio = res.data - 0 === 1
+			},
 			async getFiles(id) {
 				const params = {
 					bizId: id,
@@ -335,7 +350,8 @@
 				// 获取arraybuffer格式数据
 				let res = await uni.request({
 					method: "POST",
-					url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
+					url: `https://crm.wuliangye.com.cn/crm-app/attachmentDownFile?id=`+item.id, // 生产
+					// url: `http://221.10.127.60:5000/crm-app/attachmentDownFile?id=`+item.id,
 					params: {
 					  id: item.id
 					},
@@ -378,6 +394,12 @@
 				})
 			},
 			handleShunt() {
+				//if(this.isRadio){
+					//uni.navigateTo({
+						//url: `/pages/select-all-customer/select-all-customer?order=${JSON.stringify(this.orderItem)}`
+					//})
+					//return
+				//}
 				uni.navigateTo({
 					url: `/pages/select-shunt-list/select-shunt-list?order=${JSON.stringify(this.orderItem)}`
 				})
@@ -484,7 +506,8 @@
 				data.tempFilePaths.forEach((item,idx) => {
 					console.log('idx',data.tempFilePaths[idx],data.tempFiles[idx].file.name)
 					uni.uploadFile({
-						url: `http://221.10.127.60:5000/crm-app/webUpload/ajaxUpload`,
+						url: `https://crm.wuliangye.com.cn/crm-app/webUpload/ajaxUpload`, //生产
+						// url: `http://221.10.127.60:5000/crm-app/webUpload/ajaxUpload`,
 						filePath: data.tempFilePaths[idx],
 						name: 'file',
 						formData: {
@@ -807,6 +830,7 @@
 
 	.uni-list-cell {
 		flex: 1;
+		height: 100%;
 	}
 
 	.uni-list-cell-db {

pages/select-shunt-list/select-shunt-list.nvue

@@ -17,7 +17,7 @@
 						<view class="item-block item-block-code">
 							<text class="item-block-label">分流经销商编号：{{item.shuntingCustomer}}</text>
 						</view>
-						<view class="item-block item-block-code">
+						<view class="item-block item-block-code" v-if="item.channelsTextView">
 							<text class="item-block-label">渠道：{{item.channelsTextView}}</text>
 						</view>
 					</view>

pages/terminal-detail/terminal-detail.nvue

@@ -41,8 +41,8 @@
 				</button>
 			</view>
 			<view class="text-blocks">
-				<text class="middle-num">终端进货量：{{customerScan}}件</text>
-				<text class="middle-num">消费者开瓶扫码数量：{{inNum}}瓶</text>
+				<text class="middle-num">终端进货量：{{inNum}}件</text>
+				<text class="middle-num">消费者开瓶扫码数量：{{customerScan}}瓶</text>
 			</view>
 			<scroll-view :style='scrollHeight' class="scroll-area" scroll-y="true" lower-threshold='150'
 				@scrolltolower='scrolltolower'>

pages/usercenter/usercenter.nvue

@@ -36,7 +36,7 @@
 				<text class="entry-bill-text">销售订单</text>
 			</view>
 
-			<view class="entry-block" @click="goPage('billing-invoice')">
+			<!-- <view class="entry-block" @click="goPage('billing-invoice')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon entry-bill-icon_billing"
 						src="@/static/image/usercenter_billinginvoice@3x.png" mode="">
@@ -44,7 +44,7 @@
 				</view>
 				<text class="entry-bill-text">账票管理</text>
 			</view>
-
+ -->
 			<view class="entry-block" @click="goPage('ticket-order')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon entry-bill-icon_billing"
@@ -53,7 +53,7 @@
 				<text class="entry-bill-text">制票通知单</text>
 			</view>
 
-			<view class="entry-block" @click="goPage('produce-order')">
+			<!-- <view class="entry-block" @click="goPage('produce-order')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon" src="@/static/image/usercenter_produceorder@3x.png" mode=""></image>
 				</view>
@@ -67,7 +67,7 @@
 					</image>
 				</view>
 				<text class="entry-bill-text">包材计划</text>
-			</view>
+			</view> -->
 
 			<view class="entry-block" @click="goPage('my-purchase')">
 				<view class="entry-bill">
@@ -76,17 +76,15 @@
 				<text class="entry-bill-text">要货单查询</text>
 			</view>
 
-			<view class="entry-block" @click="goPage('market-order')">
+			<!-- <view class="entry-block" @click="goPage('market-order')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon entry-bill-icon_billing"
 						src="@/static/image/usercenter_billinginvoice@3x.png" mode="">
 					</image>
 				</view>
-					<!-- <uni-badge :text="num" absolute="rightTop" :offset="[0, 0]" size="small" :customStyle="{background: '#f43530'}">
-					</uni-badge> -->
 					<text class="dot" v-if="num">{{num}}</text>
 					<text class="entry-bill-text">市场秩序</text>
-			</view>
+			</view> -->
 			<view class="entry-block" @click="goPage('order-trends')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon entry-bill-icon_billing"

servers/api.helper.js

@@ -183,23 +183,23 @@ class Request {
 
 
 					if (config.url.indexOf('crm-app') !== -1) {
-						// config.baseUrl = 'https://crm.wuliangye.com.cn'
-						config.baseUrl = 'http://221.10.127.60:5000'
+						config.baseUrl = 'https://crm.wuliangye.com.cn'
+						// config.baseUrl = 'http://221.10.127.60:5000'
 					} else if (config.url.indexOf('adapter') !== -1) {
-						// config.baseUrl = 'http://api.wuliangcreart.com'
-						config.baseUrl = 'http://221.10.127.60:5000/gateway/cyj'
+						config.baseUrl = 'http://api.wuliangcreart.com'
+						// config.baseUrl = 'http://221.10.127.60:5000/gateway/cyj'
 					} else if (config.url.indexOf('wmdpwebservices') !== -1) {
-						// config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/sczx'
-						config.baseUrl = 'http://221.10.127.60:5000/gateway/sczx'
+						config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/sczx'
+						// config.baseUrl = 'http://221.10.127.60:5000/gateway/sczx'
 					} else if (config.url.indexOf('wmdp-storeapp') !== -1) {
-						// config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/zdcx'
-						config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
+						config.baseUrl = 'https://crm.wuliangye.com.cn/gateway/zdcx'
+						// config.baseUrl = 'http://221.10.127.60:5000/gateway/zdcx'
 					} else if (config.url.indexOf('uusafe') !== -1) {
-						// config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
-						config.baseUrl = 'https://zzy.ipincloud.cn:9070'
+						config.baseUrl = 'https://apps.wuliangye.com.cn:9076'
+						// config.baseUrl = 'https://zzy.ipincloud.cn:9070'
 					} else {
-						// config.baseUrl = 'http://218.89.67.37:8001/wlySap'
-						config.baseUrl = 'http://221.10.127.60:5000/wlySap'
+						config.baseUrl = 'http://218.89.67.37:8001/wlySap'
+						// config.baseUrl = 'http://221.10.127.60:5000/wlySap'
 					}
 				} catch (e) {
 					console.log('error', e)

servers/purchaseList.js

@@ -116,3 +116,7 @@ export async function attachmentDownFile(params) {
 	const res = await apiHelper.post('/crm-app/attachmentDownFile',  params)
 	return res
 }
+export async function findShuntAnyByDealer(params) {
+	const res = await apiHelper.get('/crm-app/setShunting/findShuntAnyByDealer',  params)
+	return res
+}
\ No newline at end of file