Browse Source

扫码优化

lilei 3 years ago
parent
commit
9a491c0a4a

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.0.0",
-    "versionCode" : 100,
+    "versionName" : "1.0.1",
+    "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 0 - 28
nativePlugins/Mpaas-Scan/package.json

@@ -1,28 +0,0 @@
-{
-    "name": "支付宝原生扫码插件",
-    "id": "Mpaas-Scan",
-    "version": "1.2.2",
-    "description": "支付宝原生扫码组件,包体积仅0.7MB,15分钟即可完成接入。同时,mPaaS提供「扫码分析」大盘,",
-    "_dp_type": "nativeplugin",
-    "_dp_nativeplugin": {
-        "ios": {
-            "plugins": [
-                {
-                    "type": "module",
-                    "name": "Mpaas-Scan-Module",
-                    "class": "MP_ScanModule"
-                }
-            ],
-            "integrateType": "framework",
-            "privacies": [
-                "NSPhotoLibraryUsageDescription",
-                "NSCameraUsageDescription"
-            ],
-            "resources": [
-                "TBDecodeSDK.bundle",
-                "TBScanSDK.bundle",
-                "meta.config"
-            ]
-        }
-    }
-}

+ 2 - 2
pages/sales/edit.vue

@@ -82,13 +82,13 @@
 			</view>
 		</view>
 		<!-- 操作按钮 -->
-		<view class="sales-btn-box">
+		<!-- <view class="sales-btn-box">
 			<view v-if="pageData.type=='edit'" class="flex align_center justify_between">
 				<u-button class="handle-btn" size="medium" hover-class="none" @click="handleDel()">整单删除</u-button>
 				<u-button class="handle-btn search-btn" @click="handleSubmit" size="medium" hover-class="none" :custom-style="customBtnStyle">提交</u-button>
 			</view>
 			<u-button v-if="pageData.type=='detail' && (detailData&&detailData.billStatus !== 'CANCEL' && detailData.billStatus !== 'FINISH' && detailData.billStatus != 'WAIT_OUT_WAREHOUSE')" class="edit-btn" @click="goPage" size="medium" hover-class="none" :custom-style="customBtnStyle">编辑</u-button>
-		</view>
+		</view> -->
 		<!-- 基础信息 -->
 		<orderInfoModal :openModal="infoModal" :infoData="detailData" @close="infoModal=false" />
 		<!-- 折扣 -->

+ 3 - 3
pages/sales/index.vue

@@ -26,10 +26,10 @@
 				<u-image class="nav-pic" style="margin-top: 5upx;" :src="`../../static/${theme}/navIcon/price_icon.png`" width="60" height="60"></u-image>
 				<text class="nav-txt" style="margin-top: 5upx;">产品报价</text>
 			</view>
-			<view class="nav-item" @click="toPage('/pages/sales/chooseCustomer')">
+			<!-- <view class="nav-item" @click="toPage('/pages/sales/chooseCustomer')">
 				<u-image class="nav-pic" :src="`../../static/${theme}/navIcon/sale_icon.png`" width="70" height="70"></u-image>
 				<text class="nav-txt">新增销售单</text>
-			</view>
+			</view> -->
 		</view>
 		<!-- 销售单 -->
 		<view class="sales-list">
@@ -183,7 +183,7 @@
 		}
 		.nav-cont{
 			.nav-item{
-				width: 49%;
+				width: 100%;
 				border-radius: 25upx;
 				background-color: #ffffff;
 				padding: 14upx 0;

+ 2 - 2
pages/sales/listComponent.vue

@@ -25,14 +25,14 @@
 							<view class="flex_1">收款方式:<text>{{item.settleStyleEntity&&item.settleStyleEntity.name||'--'}}</text></view>
 						</view>
 					</view>
-					<view class="button-box">
+					<!-- <view class="button-box">
 						<u-button @click="handleFun('audit', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.billStatus == 'WAIT_AUDIT'">审核</u-button>
 						<u-button @click="handleFun('out', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.billStatus == 'WAIT_OUT_WAREHOUSE'">出库</u-button>
 						<u-button @click="handleEdit(item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="(item.salesBillSource == 'SATELLITE' || item.salesBillSource == 'SALES' || item.salesBillSource == 'TEMPORARY_DISPATCHING') && (item.billStatus == 'WAIT_AUDIT' || item.billStatus == 'WAIT_SUBMIT' || item.billStatus == 'AUDIT_REJECT')">编辑</u-button>
 						<u-button @click="handleFun('del', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="((item.salesBillSource == 'SATELLITE' || item.salesBillSource == 'SALES' || item.salesBillSource == 'TEMPORARY_DISPATCHING') && item.billStatus != 'FINISH')">删除</u-button>
 						<u-button @click="handleEdit(item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.salesBillSource == 'PURCHASE' && (item.billStatus == 'WAIT_AUDIT' || item.billStatus == 'SUPERIOR_CHANGE')">改单</u-button>
 						<u-button @click="handleFun('cancel', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.salesBillSource == 'PURCHASE' && (item.billStatus == 'WAIT_AUDIT' || item.billStatus == 'SUPERIOR_CHANGE')">取消</u-button>
-					</view>
+					</view> -->
 				</view>
 				<view v-if="listData && listData.length == 0">
 					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>