更新

components/uview-ui/components/u-modal/u-modal.vue

@@ -101,7 +101,7 @@
 			},
 			// 是否显示取消按钮
 			showCancelButton: {
-				type: String,
+				type: Boolean,
 				default: false
 			},
 			// 确认文案

demo.vue

@@ -2,7 +2,7 @@
 	<view class="wrap">
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>

pageA/product/buydetails.vue

@@ -171,7 +171,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pageA/product/detail.vue

@@ -263,10 +263,10 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='去认证' title='温馨提示'
-			showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
+			:showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
 	</view>
 </template>
 

pageA/product/detail_buy.vue

@@ -158,7 +158,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 					:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-					showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+					:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pageA/product/saledetails.vue

@@ -171,7 +171,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pageA/product/sales_detail.vue

@@ -261,7 +261,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pageB/contract/collectLook.vue

@@ -71,7 +71,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 
 	</view>
 </template>

pageB/contract/contract.vue

@@ -73,7 +73,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 		<!-- </block> -->
 	</view>
 </template>

pageB/contract/look.vue

@@ -92,7 +92,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 
 	</view>
 </template>

pageB/trust/trust.vue

@@ -281,7 +281,7 @@
 			</view>
 			<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 				:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定'
-				title='提示' showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick">
+				title='提示' :showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick">
 			</u-modal>
 		</block>
 

pages/bill/index.vue

@@ -81,7 +81,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/business/businessNew.vue

@@ -31,7 +31,7 @@
 						<view class="row1 flex jcsb alc">
 							<view class="left flex alc">
 								<image
-									:src="item.commonUser.avatarUrl?item.commonUser.avatarUrl:'../../static/img/face/27.png'"
+									:src="item.commonUser.avatarUrl?item.commonUser.avatarUrl:'../../static/img/myimg/YongHu@3x.png'"
 									mode="widthFix" class="head-img"></image>
 								<view class="">
 									<view class="title">
@@ -102,13 +102,13 @@
 				<u-icon name="plus" color="#fff" size="34" bold></u-icon>
 			</view>
 			<u-modal v-model="show" content="确定不在关注？" :show-title='false' :show-cancel-button='true'
-				:content-style="contentStyle" showCancelButton='true' @confirm="cancelFollow" @cancel="show=false">
+				:content-style="contentStyle"  @confirm="cancelFollow" @cancel="show=false">
 			</u-modal>
 		</view>
 		<search  :searchcontent='keyword1' v-if="isShowSearch" @searchVal='searchVal'></search>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' content="尚未登录,是否立即登录" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			 content="尚未登录,是否立即登录" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 		<u-modal v-model="isSHowReleaseAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400','text-align':'left'}" confirm-color='#22C572'
 			confirm-text='我知道了' title='温馨提示' content="交易信息为用户自由发布，正式签订合同前切勿进行任何付款操作，以免给您的财产造成损失。"
@@ -145,8 +145,6 @@
 				selectPlace: '',
 				mescroll: null,
 				isShowAlert: false,
-				showCancelButton: 'true',
-				showCancelButton1: 'false',
 				contentStyle: {
 					"font-weight": 700
 				},
@@ -429,6 +427,7 @@
 				}
 				await this.$api.doRequest('get', '/transactionExchangeInfo/selectTransactionExchangeInfo', _obj).then(
 					res => {
+						console.log(res.data)
 						if (res.data.code == 200) {
 							console.log(res.data.data.records, page.num)
 							let curPageData = res.data.data.records;

pages/business/myAttention.vue

@@ -11,7 +11,7 @@
 			<view class="list" v-if="goods.length!=0">
 				<view class="list-item" v-for="(item,index) in goods">
 					<view class="left">
-						<image :src="item.commonUser.avatarUrl?item.commonUser.avatarUrl:'../../static/img/face/27.png'"
+						<image :src="item.commonUser.avatarUrl?item.commonUser.avatarUrl:'../../static/img/myimg/YongHu@3x.png'"
 							mode="aspectFill" class="head-img"></image>
 						<view class="name">
 							{{item.commonUser.wechatNo}}
@@ -31,7 +31,7 @@
 		</mescroll-body>
 
 		<u-modal v-model="show" :content="content" :show-title='false' :show-cancel-button='true'
-			:content-style="contentStyle" showCancelButton='true' @confirm="cancelFollow" @cancel="show=false">
+			:content-style="contentStyle" :showCancelButton='true' @confirm="cancelFollow" @cancel="show=false">
 		</u-modal>
 		<u-toast ref="uToast" />
 	</view>

pages/business/record.vue

@@ -55,7 +55,7 @@
 		<u-toast ref="uToast" />
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' content="确定删除当前记录？" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' content="确定删除当前记录？" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/business/release.vue

@@ -81,7 +81,7 @@
 		</u-popup>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' content="确定发布交易信息？" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' content="确定发布交易信息？" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/erp/index.vue

@@ -66,11 +66,11 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='立即开通'
-			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService"
+			title='您尚未开通ERP业务' :showCancelButton='false' :content="content" @confirm="goOpenService"
 			@cancel="cancelClick"></u-modal>
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
+			:showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
 	</view>
 </template>
 <script>

pages/erpbusiness/QRCode/QRCode.vue

@@ -7,7 +7,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/erpbusiness/acquisitionInformation.vue

@@ -33,10 +33,10 @@
 		<u-toast ref="uToast" />
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='收购信息'
-			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -68,7 +68,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -70,7 +70,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/erpbusiness/add_quality_testing.vue

@@ -441,7 +441,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @cancel="cancelClick"></u-modal>
 		<!-- @confirm="alertBtn" -->
 		<u-popup v-model="isShowPrint" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
 			<view class="buns_item">

pages/erpbusiness/customerSee.vue

@@ -90,7 +90,7 @@
 				</view>
 			</view>
 		</view>
-		<u-modal v-model="auditShow" confirm-color='#22C572' confirm-text='确定' title='提示' showCancelButton='false'
+		<u-modal v-model="auditShow" confirm-color='#22C572' confirm-text='确定' title='提示' :showCancelButton='false'
 			:content="content" @confirm="next" @cancel="cancel"></u-modal>
 	</view>
 </template>

pages/erpbusiness/edit_quality_testing.vue

@@ -458,7 +458,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 		<u-popup v-model="isShowPrint" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
 			<view class="buns_item">
 				<view class="but_css" @click="print">打印小票</view>

pages/erpbusiness/index.vue

@@ -37,10 +37,10 @@
 		</view> -->
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='温馨提示'
-			showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
+			:showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
 	</view>
 </template>
 <script>

pages/grain_pulse/dynamic.vue

@@ -62,7 +62,7 @@
 		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/grain_pulse/home.vue

@@ -79,7 +79,7 @@
 		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/home/home.vue

@@ -113,7 +113,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 					:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-					showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+					:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/oa_office/the_oaOffice.vue

@@ -13,10 +13,10 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='温馨提示'
-			showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
+			:showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
 	</view>
 </template>
 

pages/task/audit/acquisition_information_approval.vue

@@ -25,7 +25,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>

pages/task/audit/freight_setting_approval.vue

@@ -121,7 +121,7 @@
 		</u-form>
 		<u-modal v-model="show" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="passSubmit" @cancel="show = false"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="passSubmit" @cancel="show = false"></u-modal>
 		<u-button type="primary" class="submit" @click="show = true" v-if="list.priceStatus == '审核中'||isSHowBtn">通过
 		</u-button>
 	</view>

pages/tran/car_detail.vue

@@ -81,7 +81,7 @@
 		</view> -->
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/tran/my_tran.vue

@@ -132,7 +132,7 @@
 		</swiper>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/tran/tran_detail.vue

@@ -82,7 +82,7 @@
 			</view>
 			<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 				:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定'
-				title='提示' showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick">
+				title='提示' :showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick">
 			</u-modal>
 			<!-- <view class="d-header">
 				<text>承运信息</text>

pages/user/contractLook/inventoryCost.vue

@@ -25,7 +25,7 @@
 		</view>
 		<u-modal class="record" v-model="isShowDetailBtn" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='导出记录'
-			showCancelButton='false' @confirm="alertBtn" @cancel="cancelClick">
+			:showCancelButton='false' @confirm="alertBtn" @cancel="cancelClick">
 			<view>
 				<u-radio-group v-model="value">
 					<u-radio active-color="#22C572" @change="radioChange" v-for="(item, index) in list" :key="index"
@@ -50,7 +50,7 @@
 			range-bg-color='rgba(25, 190, 107, 0.13)' active-bg-color='#22C572'></u-calendar>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/user/depotAcquisition/depotAcquisition.vue

@@ -44,7 +44,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>

pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -31,11 +31,11 @@
 			</view>
 			<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 				:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定'
-				title='提示' showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick">
+				title='提示' :showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick">
 			</u-modal>
 			<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 				:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定'
-				title='提示' showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick">
+				title='提示' :showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick">
 			</u-modal>
 		</view>
 	</mescroll-body>

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -83,10 +83,10 @@
 		<u-button class='submit' @click='submit'>提交</u-button>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 		<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content1" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>

pages/user/depotMonitoring.vue

@@ -35,7 +35,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>

pages/user/setUp.vue

@@ -89,7 +89,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='温馨提示'
-			showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/user/task_detail_kn.vue

@@ -93,7 +93,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/user/user.vue

@@ -51,7 +51,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
-			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
+			:showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 	<!-- <view style="margin-top: 10rpx;">
 			<web-view src="https://datav.aliyuncs.com/share/01de6913a5761ab4d3171b1f0b3e0704"></web-view>