ccjgmwz 3 years ago
parent
commit
cb75fb4342

+ 1 - 0
manifest.json

@@ -81,6 +81,7 @@
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>"
                 ]
             },

+ 1 - 8
pageA/product/Identity_switching.vue

@@ -150,7 +150,7 @@
 			},
 			checkBox(e, item) {
 				for (var i = 0; i < this.lists.length; i++) {
-					this.lists[i].checked = true
+					this.lists[i].checked = false
 				}
 				item.checked = true
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', {
@@ -159,13 +159,6 @@
 						commonId: this.userInfo.id
 					}).then(res => {
 						if (res.data.code == 200) {
-							// this.lists = res.data.data.records
-
-							uni.navigateBack({
-
-								delta: 1
-
-							})
 						}
 					})
 					.catch(res => {

+ 3 - 3
pageA/product/business_buy.vue

@@ -119,7 +119,7 @@
 			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
 				<view class="title">包装费(元/吨)</view>
 				<view class="con-list">
-					<input placeholder="请填写包装费" name="input" @input='someprice' v-model="packingFee"></input>
+					<input placeholder="请填写包装费" name="input" placeholder-style="font-size: 12px;" @input='someprice' v-model="packingFee"></input>
 					
 				</view>
 			</view>
@@ -216,7 +216,7 @@
 				unloadingFee: 0,
 				packingMoney: 0,
 				packing: '散装',
-				packingFee: 0,
+				packingFee: null,
 				// choice : false,
 			};
 		},
@@ -244,7 +244,7 @@
 			
 		},
 		onShow() {
-			if( this.$store.state.choice != "" ){
+			if( this.$store.state.choice != "" && this.goods.customerTypeFlag){
 				if(this.goods.customerTypeFlag==1){
 					this.goods.customerName = this.$store.state.choice
 				}else if(this.goods.customerTypeFlag==2){

+ 1 - 1
pageA/product/business_sale.vue

@@ -156,7 +156,7 @@
 					},
 					purchaseOrder: {
 						invoiceFee:0,
-						packingFee:0,
+						packingFee:null,
 						packingType:"散装",
 						packingTypeKey:1,
 						type:'不开发票',

+ 1 - 1
pageA/product/lookup.vue

@@ -4,7 +4,7 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-				<input type="text" maxlength="20" v-model="searchKeyWord" @confirm="doSearch()" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+				<input type="text" maxlength="20" :focus="true" v-model="searchKeyWord" @confirm="doSearch()" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
 				
 			</view>
 			<view @click='doSearch()' style="width:4%;flex:1;">搜索</view>

+ 1 - 0
pageA/product/sales_detail.vue

@@ -310,6 +310,7 @@
 					// 失败回调
 					fail: (res) => {
 						console.log('调用失败!')
+						that.contactUs()
 					}
 					
 				  });

+ 1 - 2
pages.json

@@ -173,8 +173,7 @@
 		{
 			"path": "pages/attestation/index",
 			"style": {
-				"navigationBarTitleText": "身份认证",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "身份认证"
 			}
 		},
 		{

+ 0 - 10
pages/sale/information.vue

@@ -321,9 +321,6 @@
 					that.categoryList = data
 					uni.hideLoading()
 				})
-				uni.showLoading({
-					title: '正在加载',
-				})
 				// 工厂价格
 				that.$api.request('news', 'getFactoryPriceInfo',{
 					category:this.category,
@@ -372,9 +369,6 @@
 					that.newsInfo = data
 					uni.hideLoading()
 				})
-				uni.showLoading({
-					title: '正在加载',
-				})
 				that.$api.request('integral', 'getIndexData', failres => {
 					that.$api.msg(failres.errmsg)
 					this.isLoadMore = false
@@ -498,10 +492,6 @@
 				const that = this
 				var pages=that.pages
 				var limit=that.limit
-							   
-				uni.showLoading({
-					title: '正在加载',
-				})
 				that.$api.request('news', 'getNewsInfo', {
 					category:2,
 					page: 1,

+ 3 - 3
pages/user/setUp.vue

@@ -9,7 +9,7 @@
 				<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow" ></image>
 			</view>
 		</view>
-		<view class="flex headPortrait justify-between" @click="nickname">
+		<view class="flex headPortrait justify-between" @click="nickname(username)">
 			<view class="title">昵称</view>
 			<view class="nextStep flex">
 				<view class="username">
@@ -54,9 +54,9 @@
 					url: `/pages/user/set_picture`
 				})
 			},
-			nickname(){
+			nickname(username){
 				uni.navigateTo({
-					url: `/pages/user/set_nickname`
+					url: `/pages/user/set_nickname?nickname=${username}`
 				})
 			}
 		}

+ 4 - 1
pages/user/set_nickname.vue

@@ -24,6 +24,9 @@
 				deptListurl: {},
 			}
 		},
+		onLoad(param) {
+			this.nickname = param.nickname
+		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
@@ -114,7 +117,7 @@
 
 	.texts {
 		line-height: 50px;
-		color: #C6C6C8;
+		/* color: #C6C6C8; */
 		font-size: 16px;
 		/* placeholder-style="font-size:18px" */
 	}