Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

demo.vue

@@ -1,7 +1,7 @@
 <template>
 	<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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>

main.js

@@ -133,7 +133,7 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 							failCallback(res.data)
 						}
 						uni.showModal({
-							title: '登录提示',
+							title: '提示',
 							content: '您尚未登录，是否立即登录？',
 							showCancel: true,
 							confirmText: '登录',
@@ -150,7 +150,7 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 						if (!loginLock) {
 							loginLock = true
 							// uni.showModal({
-							// 	title: '登录提示',
+							// 	title: '提示',
 							// 	content: '您尚未登录，是否立即登录？',
 							// 	showCancel: false,
 							// 	confirmText: '登录',

pageA/product/buydetails.vue

@@ -170,7 +170,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -396,7 +396,7 @@
 				if (this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pageA/product/detail.vue

@@ -227,7 +227,7 @@
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='去认证' title='温馨提示'
 			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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
 	</view>
 </template>
@@ -423,7 +423,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert1 = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -555,7 +555,7 @@
 				// })
 				// if (!this.hasLogin) {
 				// 	uni.showModal({
-				// 		title: '登录提示',
+				// 		title: '提示',
 				// 		content: '您尚未登录，是否立即登录？',
 				// 		showCancel: true,
 				// 		confirmText: '登录',

pageA/product/detail_buy.vue

@@ -157,7 +157,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-					:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+					:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 					showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -241,7 +241,7 @@
 			tradeNow(){
 				if (!this.hasLogin) {
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pageA/product/saledetails.vue

@@ -170,7 +170,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -396,7 +396,7 @@
 				if (this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pageA/product/sales_detail.vue

@@ -223,7 +223,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -401,7 +401,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -518,7 +518,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pageB/contract/collectLook.vue

@@ -70,7 +70,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 
 	</view>
@@ -291,7 +291,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pageB/contract/contract.vue

@@ -72,7 +72,7 @@
 			<!-- <button class="cu-btn commit margin-tb-sm lg" @click="commit">提交</button> -->
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 		<!-- </block> -->
 	</view>
@@ -360,7 +360,7 @@
 				if (this.hasLogin) {
 					this.isShowAlert = true;
 					// 	uni.showModal({
-					// 		title: '登录提示',
+					// 		title: '提示',
 					// 		content: '您尚未登录，是否立即登录？',
 					// 		showCancel: true,
 					// 		confirmText: '登录',

pageB/contract/look.vue

@@ -91,7 +91,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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 
 	</view>
@@ -348,7 +348,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

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>
 
@@ -400,7 +400,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -666,7 +666,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/attestation/index.vue

@@ -214,7 +214,7 @@
 			},
 			deleteLS(item) {
 				uni.showModal({
-					// title: '登录提示',
+					// title: '提示',
 					content: '身份信息删除后不可恢复，是否确定删除？',
 					showCancel: true,
 					confirmText: '确定',
@@ -255,7 +255,7 @@
 				this.deletes = {}
 				this.deletes.id = item.id
 				uni.showModal({
-					// title: '登录提示',
+					// title: '提示',
 					content: '身份信息删除后不可恢复，是否确定删除？',
 					showCancel: true,
 					confirmText: '确定',

pages/attestation/indexTwo.vue

@@ -411,7 +411,7 @@
 			},
 			deleteLS(item) {
 				uni.showModal({
-					// title: '登录提示',
+					// title: '提示',
 					content: '身份信息删除后不可恢复，是否确定删除？',
 					showCancel: true,
 					confirmText: '确定',

pages/bill/index.vue

@@ -74,7 +74,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -230,7 +230,7 @@
 				if(!this.hasLogin){
 					this.isShowAlert = true;
 				// 	ni.showModal({
-				// 		title: '登录提示',
+				// 		title: '提示',
 				// 		content: '您尚未登录，是否立即登录？',
 				// 		showCancel: true,
 				// 		confirmText: '登录',

pages/erp/contactCustomerService/contactCustomerService.vue

@@ -88,7 +88,7 @@
 				if (res.data.data == "INVALID") {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '当前登入信息验证失败，是否重新登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/erp/index.vue

@@ -57,7 +57,7 @@
 			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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
 	</view>
 </template>
@@ -219,7 +219,7 @@
 				if (res.data.data == "INVALID") {
 					this.isShowAlert1 = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '当前登入信息验证失败，是否重新登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -309,7 +309,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert1 = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/erp/openService/openService.vue

@@ -88,7 +88,7 @@
 				if (res.data.data == "INVALID") {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '当前登入信息验证失败，是否重新登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/erpbusiness/QRCode/QRCode.vue

@@ -6,7 +6,7 @@
 			<!-- <view class="qrcode-text">客户扫码</view> -->
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -28,7 +28,7 @@
 					if (res.data.data == "INVALID") {
 						this.isShowAlert = true;
 						// uni.showModal({
-						// 	title: "登录提示",
+						// 	title: "提示",
 						// 	content: "Session过期需要重新登录,是否立即登录",
 						// 	showCancel: true,
 						// 	confirmText: '登录',

pages/erpbusiness/acquisitionInformation.vue

@@ -29,7 +29,7 @@
 		</view>
 		<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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			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='收购信息'
@@ -101,7 +101,7 @@
 				if (res.data.data == "INVALID") {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '当前登入信息验证失败，是否重新登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -65,7 +65,7 @@
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -102,7 +102,7 @@
 					if (res.data.data == "INVALID") {
 						this.isShowAlert = true;
 						// uni.showModal({
-						// 	title: "登录提示",
+						// 	title: "提示",
 						// 	content: "Session过期需要重新登录,是否立即登录",
 						// 	showCancel: true,
 						// 	confirmText: '登录',

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -69,7 +69,7 @@
 			<view @click='add' class="button" v-if='getRoles("acquisitionWeightOut.new")'>新增</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -104,7 +104,7 @@
 					if (res.data.data == "INVALID") {
 						this.isShowAlert = true;
 						// uni.showModal({
-						// 	title: "登录提示",
+						// 	title: "提示",
 						// 	content: "Session过期需要重新登录,是否立即登录",
 						// 	showCancel: true,
 						// 	confirmText: '登录',

pages/erpbusiness/add_quality_testing.vue

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

pages/erpbusiness/index.vue

@@ -37,7 +37,7 @@
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='温馨提示'
 			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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content1" @confirm="alertBtn1" @cancel="cancelClick1"></u-modal>
 	</view>
 </template>
@@ -199,7 +199,7 @@
 				if (res.data.data == "INVALID") {
 					this.isShowAlert1 = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '当前登入信息验证失败，是否重新登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -417,7 +417,7 @@
 				}
 				if (!this.hasLogin) {
 					uni.showModal({
-						title: '登录提示',
+						title: '提示',
 						content: '您尚未登录，是否立即登录？',
 						showCancel: true,
 						confirmText: '登录',
@@ -442,7 +442,7 @@
 			setting() {
 				if (!this.hasLogin) {
 					uni.showModal({
-						title: '登录提示',
+						title: '提示',
 						content: '您尚未登录，是否立即登录？',
 						showCancel: true,
 						confirmText: '登录',

pages/grain_pulse/dynamic.vue

@@ -61,7 +61,7 @@
 		</view>
 		<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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -204,7 +204,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -258,7 +258,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/grain_pulse/home.vue

@@ -78,7 +78,7 @@
 		</view>
 		<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='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -362,7 +362,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/home/home.vue

@@ -112,7 +112,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-					:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+					:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 					showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -232,7 +232,7 @@ export default {
 		if (!this.hasLogin) {
 			this.isShowAlert = true;
 			// uni.showModal({
-			// 	title: '登录提示',
+			// 	title: '提示',
 			// 	content: '您尚未登录，是否立即登录？',
 			// 	showCancel: true,
 			// 	confirmText: '登录',

pages/release/release.vue

@@ -172,7 +172,7 @@
 				if (item.type == "买粮") {
 					var that = this
 					uni.showModal({
-						// title: '登录提示',
+						// title: '提示',
 						content: '确定删除该信息？',
 						showCancel: true,
 						confirmText: '确定',
@@ -203,7 +203,7 @@
 					})
 				} else if (item.type == "卖粮") {
 					uni.showModal({
-						// title: '登录提示',
+						// title: '提示',
 						content: '确定删除该信息？',
 						showCancel: true,
 						confirmText: '确定',

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -63,10 +63,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
-						<view class='row'>
+						<!-- <view class='row'>
 							<view class="left">预估运费（元/吨）</view>
 							<view class="right">{{retreatList.estimatedFreight}}</view>
-						</view>
+						</view> -->
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{retreatList.agent}}</view>
@@ -86,7 +86,7 @@
 						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
 							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" />
 						</u-form-item>
-						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+						<u-form-item v-if='!retreatList.status' label="单价(元/吨)" prop="unitPrice" label-width="160">
 							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" />
 						</u-form-item>
 					</view>
@@ -127,10 +127,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{OutList.predictDate}}</view>
 						</view>
-						<view class='row'>
+						<!-- <view class='row'>
 							<view class="left">预估运费（元/吨）</view>
 							<view class="right">{{OutList.estimatedFreight}}</view>
-						</view>
+						</view> -->
 						<view class='row'>
 							<view class="left">发货人</view>
 							<view class="right">{{OutList.agent}}</view>
@@ -152,8 +152,7 @@
 							v-if="retreatList.inOutType != '退库'">
 							<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
 						</u-form-item>
-						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
-							v-if="retreatList.inOutType != '退库'">
+						<u-form-item v-if='!retreatList.status&&retreatList.inOutType != "退库"' label="单价(元/吨)" prop="unitPrice" label-width="160">
 							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
 						</u-form-item>
 						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top"
@@ -204,10 +203,10 @@
 							<view class="left">预计入库日期</view>
 							<view class="right">{{EnterList.predictDate}}</view>
 						</view>
-						<view class='row'>
+						<!-- <view class='row'>
 							<view class="left">预估运费（元/吨）</view>
 							<view class="right">{{EnterList.estimatedFreight}}</view>
-						</view>
+						</view> -->
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{EnterList.agent}}</view>
@@ -230,8 +229,7 @@
 							v-if="EnterList.inOutType != '移库入库'">
 							<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" />
 						</u-form-item>
-						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
-							v-if="EnterList.inOutType != '移库入库'">
+						<u-form-item v-if='!EnterList.status&&EnterList.inOutType != "移库入库"' label="单价(元/吨)" prop="unitPrice" label-width="160">
 							<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" />
 						</u-form-item>
 						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
@@ -340,6 +338,9 @@
 							relevanceId: res.data.data.relevanceId
 						}).then(res => {
 							if (res.data.code == 200) {
+								this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+									compId:uni.getStorageSync('pcUserInfo').compId
+								}).then(res1 => {
 								for (let i = 0; i < res.data.data.length; i++) {
 									if (res.data.data[i].inOutType == "移库出库" || res.data.data[i]
 										.inOutType == "贸易服务出库" || res.data.data[i].inOutType == "销售出库" ||
@@ -357,6 +358,23 @@
 										this.retreatList.judge = 3
 									}
 								}
+								for(let i = 0; i < res1.data.data.length; i++) {
+									if(res1.data.data[i].contractNo==this.EnterList.contractNo){
+										if(res1.data.data[i].priceType=='随行就市'){
+											this.EnterList.status=true
+										}else{
+											this.EnterList.status=false
+										}
+									}
+									if(res1.data.data[i].contractNo==this.retreatList.contractNo){
+										if(res1.data.data[i].priceType=='随行就市'){
+											this.retreatList.status=true
+										}else{
+											this.retreatList.status=false
+										}
+									}
+								}
+								})
 							}
 						})
 					}

pages/task/audit/Issueandreceipt_task_details.vue

@@ -60,10 +60,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
-						<view class='row'>
+						<!-- <view class='row'>
 							<view class="left">预估运费（元/吨）</view>
 							<view class="right">{{retreatList.estimatedFreight}}</view>
-						</view>
+						</view> -->
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{retreatList.agent}}</view>
@@ -122,10 +122,10 @@
 							<view class="left">预计出库日期</view>
 							<view class="right">{{OutList.predictDate}}</view>
 						</view>
-						<view class='row'>
+						<!-- <view class='row'>
 							<view class="left">预估运费（元/吨）</view>
 							<view class="right">{{OutList.estimatedFreight}}</view>
-						</view>
+						</view> -->
 						<view class='row'>
 							<view class="left">发货人</view>
 							<view class="right">{{OutList.agent}}</view>
@@ -197,10 +197,10 @@
 							<view class="left">预计入库日期</view>
 							<view class="right">{{EnterList.predictDate}}</view>
 						</view>
-						<view class='row'>
+						<!-- <view class='row'>
 							<view class="left">预估运费（元/吨）</view>
 							<view class="right">{{EnterList.estimatedFreight}}</view>
-						</view>
+						</view> -->
 						<view class='row'>
 							<view class="left">收货人</view>
 							<view class="right">{{EnterList.agent}}</view>

pages/task/audit/acquisition_information_approval.vue

@@ -24,7 +24,7 @@
 			<u-button v-if='isSHowBtn' @click='passSubmit' type="success" class="btn2">通过</u-button>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>

pages/task/my_task.vue

@@ -80,6 +80,13 @@
 				copyTaskInfo: []
 			};
 		},
+		onBackPress(e) {
+			if (uni.getStorageSync("everyTask")) {
+				uni.switchTab({
+				    url: '/pages/user/user'
+				});
+			}
+		},
 		watch: {
 			checked(val) {
 				uni.setStorageSync("everyTask", this.checked)
@@ -189,7 +196,7 @@
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				if (res.data.data == "INVALID") {
 					uni.showModal({
-						title: '登录提示',
+						title: '提示',
 						content: '当前登入信息验证失败，是否重新登录？',
 						showCancel: true,
 						confirmText: '登录',
@@ -356,6 +363,9 @@
 							} else {
 								_str.showRow = true;
 							}
+							if(_str.businessType=='TRADE'){
+								_str.showRow = false
+							}
 							this.taskInfo[i].department = this.taskInfo[i].messageContent.split(' ')[0]
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {

pages/tran/car_detail.vue

@@ -80,7 +80,7 @@
 			</view>
 		</view> -->
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -157,7 +157,7 @@
 			showModal(e) {
 				// if (!this.hasLogin||this.userInfo.phone == undefined) {
 				// 	uni.showModal({
-				// 		title: '登录提示',
+				// 		title: '提示',
 				// 		content: '您尚未登录，是否立即登录？',
 				// 		showCancel: true,
 				// 		confirmText: '登录',
@@ -224,7 +224,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/tran/my_tran.vue

@@ -131,7 +131,7 @@
 			</swiper-item>
 		</swiper>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -252,7 +252,7 @@
 				if (!this.hasLogin || this.userInfo.phone == undefined) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

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>
@@ -579,7 +579,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/user/depotAcquisition/depotAcquisition.vue

@@ -43,7 +43,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -154,7 +154,7 @@
 					id: val.id,
 					commonId: uni.getStorageSync("userInfo").id,
 					loginPhone:uni.getStorageSync("userInfo").phone,
-					warehouseName:val.warehouseName
+					warehouseName:val.warehouseName,
 				}).then(res => {
 					if (res.data.code == "200") {
 						if (val.follow == '未关注') {

pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -30,11 +30,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

@@ -14,53 +14,64 @@
 					<view class="position">{{warehouseNameAddress}}</view>
 				</view>
 			</view>
+			<view style='justify-content: space-between;' class="flex">
+				<view class="left">货名</view>
+				<view class="flex" @click='showgoodsName'>
+					<view>{{goodsName}}</view>
+					<u-picker @confirm="goodsnameConfirm" range-key='goodsName' mode="selector"
+						v-model="goodsNameshow" :range="goodsnameList"></u-picker>
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
 		</view>
 		<view class="content2">
-			<view class="wrap wrap1" v-for="(item,index) in dataList.shippingInformationList" :key='index'>
-				<view class="row1 row">
-					<!-- -{{item.customerName}} -->
-					<view class="customerName">货主-{{index+1}}</view>
-					<image src="../../../static/img/sign/shanchu@2x.png" @click="reduceBtn(index)"></image>
-				</view>
-				<view class="row2 row">
-					<view class="left">姓名</view>
-					<view class="right" @click='showCustomerName(item,index)'>
-						<view>{{item.shipperName}}</view>
-						<u-picker @confirm="nameConfirm" range-key='customerName' mode="selector"
-							v-model="item.showCustomerName" :range="nameList"></u-picker>
-						<u-icon name="arrow-right"></u-icon>
+			<view v-if='!status'>
+				<view  class="wrap wrap1" v-for="(item,index) in dataList.shippingInformationList" :key='index'>
+					<view class="row1 row">
+						<!-- -{{item.customerName}} -->
+						<view class="customerName">货主-{{index+1}}</view>
+						<image src="../../../static/img/sign/shanchu@2x.png" @click="reduceBtn(index)"></image>
 					</view>
-				</view>
-				<view class="row3 row">
-					<view class="left">
-						供应商（送粮人）
+					<view class="row2 row">
+						<view class="left">姓名</view>
+						<view class="right" @click='showCustomerName(item,index)'>
+							<view>{{item.shipperName}}</view>
+							<u-picker @confirm="nameConfirm" range-key='customerName' mode="selector"
+								v-model="item.showCustomerName" :range="nameList"></u-picker>
+							<u-icon name="arrow-right"></u-icon>
+						</view>
 					</view>
-					<view class="right">{{item.supplier}}</view>
-				</view>
-				<view class="row4 row" v-for="(item1,index1) in item.carNumberList" :key='index1'>
-					<view class="left">
-						车牌号-{{index1+1}}
+					<view class="row3 row">
+						<view class="left">
+							供应商（送粮人）
+						</view>
+						<view class="right">{{item.supplier}}</view>
 					</view>
-					<view class="right">
-						<input v-model='item1.carNo' @click.stop="handleShowKeyboard(index,index1)":disabled="true" placeholder="输入7位车牌号" name="input"></input>
-						
-						<!-- <u-input v-model="item1.carNo" placeholder="输入7位车牌号" /> -->
-						<view class="btn">
-							<view @click="addCarNumber(item.carNumberList)" style="margin-right: 20rpx;">
-								<image class='row4-img'
-									src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jia%402x.png"></image>
-							</view>
-							<view @click="delCarNumber(item.carNumberList,index1)">
-								<image class='row4-img'
-									src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jian%402x.png"></image>
+					<view class="row4 row" v-for="(item1,index1) in item.carNumberList" :key='index1'>
+						<view class="left">
+							车牌号-{{index1+1}}
+						</view>
+						<view class="right">
+							<input v-model='item1.carNo' @click.stop="handleShowKeyboard(index,index1)":disabled="true" placeholder="输入7位车牌号" name="input"></input>
+							
+							<!-- <u-input v-model="item1.carNo" placeholder="输入7位车牌号" /> -->
+							<view class="btn">
+								<view @click="addCarNumber(item.carNumberList)" style="margin-right: 20rpx;">
+									<image class='row4-img'
+										src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jia%402x.png"></image>
+								</view>
+								<view @click="delCarNumber(item.carNumberList,index1)">
+									<image class='row4-img'
+										src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/jian%402x.png"></image>
+								</view>
 							</view>
 						</view>
+				
 					</view>
-
+					
 				</view>
-				
 			</view>
-			<view class='add-good-people' @click='addGoodPeople'>
+			<view  v-if='!status' class='add-good-people' @click='addGoodPeople'>
 				<image class="img"
 					src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/tmp/ic_join_dialing_norm%402x.png"
 					@click="reduceBtn(index)"></image>增加货主
@@ -103,6 +114,8 @@
 				carNo:'',
 				warehouseNameAddress: '',
 				startDate: "",
+				goodsName:'',
+				status:false,
 				dataList: {
 					warehouseName: "",
 					validityDate: '',
@@ -118,13 +131,17 @@
 						}]
 					}]
 				},
+				goodsnameList:[],
 				selectObj: {},
+				goodsNameshow:false,
 				nameListCopy: []
 			}
 		},
 
 		onLoad(options) {
+			
 			let _pageToData = JSON.parse(options.itemValue)
+			this.warehouseId=_pageToData.warehouseId
 			this.dataList.warehouseName = _pageToData.warehouseName
 			this.startDate = this.getTime()[0]
 			this.dataList.validityDate = this.getTime()[1]
@@ -142,9 +159,24 @@
 				}
 				this.getCustomer()
 			})
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				warehouseId: this.warehouseId
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.goodsName=res.data.data[0].goodsName
+					this.goodsnameList = res.data.data
+				}
+			})
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {
+			goodsnameConfirm(e){
+				this.goodsName=this.goodsnameList[e[0]].goodsName
+				this.getCustomer()
+			},
+			showgoodsName(){
+				this.goodsNameshow=true
+			},
 			hidden(){
 				this.carNo=''
 				if(this.$refs.keyboard.open){
@@ -182,62 +214,27 @@
 				this.selectObj = value
 				this.selectObj.index = index
 				value.showCustomerName = true
-				that.$api.doRequest('get', '/paymentManagement/cumulant', {
-					compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
-					customerNumberCard: that.detailData.customerNumberCard,
-					goodsName: that.detailData.goodsName,
-				}).then(res => {
-					if (res.data.code == 200) {
-						for (let i = 0; i < that.purchasePriceList.length; i++) {
-							if (
-								that.detailData.goodsName == that.purchasePriceList[i]
-								.goodsName
-							) {
-								let count = (that.purchasePriceList[i].saleLimit -
-									res.data.data / 1000).toFixed(2)
-								if (Number(count) - that.detailData.grossWeight / 1000 <= 0) {
-									that.$api.msg('该客户累计销售' + that.detailData.goodsName + (
-											res.data.data / 1000).toFixed(2) +
-										'吨，还可售粮' +
-										count + '吨', )
-				
-								} else {
-									that.$api.doRequest('post',
-										'/weighingManagement/api/editGrossWeight', that
-										.detailData).then(res => {
-										if (res.data.code == 200) {
-											that.$refs.uToast.show({
-												title: '提交成功',
-												type: 'success'
-											})
-											uni.navigateBack({})
-										} else {
-											that.$refs.uToast.show({
-												title: '提交失败',
-												type: 'error',
-											})
-										}
-									})
-				
-								}
-							}
-						}
-					}
-				})
 			},
 			getCustomer() {
+				var that=this
 				let _data = {
 					commonId: uni.getStorageSync("userInfo").id,
+					warehouseId:this.warehouseId,
+					goodsName:this.goodsName
 				}
 				this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoUser', _data).then(
 					res => {
 						if (res.data.code == 200) {
 							this.nameList = res.data.data
 							if(res.data.data.length>0){
+							that.status=false
 								this.dataList.shippingInformationList[0].identityId = res.data.data[0].id
 								this.dataList.shippingInformationList[0].shipperName = res.data.data[0].customerName
 								this.dataList.shippingInformationList[0].supplier = res.data.data[0].supplier ? res.data
 									.data[0].supplier : '无'
+							}else{
+								that.status=true
+								this.$api.msg('当前客户的'+this.goodsName+'送粮量达到上限')
 							}
 						}
 					})
@@ -342,6 +339,10 @@
 				this.isShowAlert1 = false
 			},
 			addGoodPeople() {
+				if(this.status==true){
+					this.$api.msg('当前客户的'+this.goodsName+'送粮量达到上限')
+					return
+				}
 				// 判断是否还有剩余的货主
 				if (this.nameList.length != this.dataList.shippingInformationList.length) {
 					this.dataList.shippingInformationList.push({
@@ -353,6 +354,7 @@
 							carNo: ''
 						}]
 					})
+					this.$forceUpdate()
 				} else {
 					this.$api.msg('无更多认证货主！')
 				}

pages/user/depotMonitoring.vue

@@ -33,7 +33,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -90,7 +90,7 @@
 				if (res.data.data == "INVALID") {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '当前登入信息验证失败，是否重新登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',

pages/user/task_detail_kn.vue

@@ -92,7 +92,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -129,7 +129,7 @@
 			if (!this.hasLogin) {
 				this.isShowAlert = true;
 				// uni.showModal({
-				// 	title: '登录提示',
+				// 	title: '提示',
 				// 	content: '您尚未登录，是否立即登录？',
 				// 	showCancel: true,
 				// 	confirmText: '登录',

pages/user/user.vue

@@ -50,7 +50,7 @@
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
-			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='登录提示'
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 	<!-- <view style="margin-top: 10rpx;">
@@ -421,7 +421,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -562,7 +562,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',
@@ -588,7 +588,7 @@
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 					// uni.showModal({
-					// 	title: '登录提示',
+					// 	title: '提示',
 					// 	content: '您尚未登录，是否立即登录？',
 					// 	showCancel: true,
 					// 	confirmText: '登录',