1

BagAuth/pages/login/login.vue

@@ -23,7 +23,7 @@
 			<view class="gray-text">加载中...</view>
 		</view>
 		<view class="margin-lg flex flex-direction text-center">
-			<button v-if=checked class="cu-btn round  bg-main-oil  lg text-lg" open-type="getPhoneNumber"
+			<button v-if="checked" class="cu-btn round  bg-main-oil  lg text-lg" open-type="getPhoneNumber"
 				@getphonenumber="decryptPhoneNumber">
 				<text class="cuIcon-weixin padding-right-xs"> </text>
 				<text>

BagStation/orderInvoicing/orderInvoicing.vue

@@ -81,27 +81,14 @@
 			</uni-forms>
 		</view>
 		<view class="btn-box">
-			<view class="tip">功能暂时关闭 详情请咨询客服</view>
+			<view class="cu-btn width-50 text-lg height-80 padding text-center" @tap="backtodetail">
-<!-- 			<view class="cu-btn width-50 text-lg height-80 padding text-center" @tap="backtodetail">
 				取消
 			</view>
 			<view @tap="saveInvoicRecord"
 				class="cu-btn width-50 text-lg height-80 padding text-center bg-red text-white">
 				提交
-			</view> -->
-		</view>
-		<uni-popup ref="popup" :is-mask-click="false">
-			<view class="notice">
-				<view>用户通知</view>
-				<view>{{noticeInstance.content}}</view>
-				<view class="button-group">
-					<view @tap="back">取消</view>
-					<view :style="{color:noticeInstance.countdown == 0 ? '#576B95' : '#d3d3d3'}" @tap="iKnow">
-						{{noticeInstance.confirmText}}
-					</view>
-				</view>
 			</view>
-		</uni-popup>
+		</view>
 	</view>
 </template>
 
@@ -126,26 +113,19 @@
 					invoicBankNumber: '', //银行账号
 					remark: '', //发票备注
 					invoicEmail: '', //电子邮箱,
-					orderSerialNumber: '', //订单编号
+					orderSerialNumber: '' ,//订单编号
-					clientBelong: 'BAICHUAN'
+					clientBelong:'BAICHUAN'
-				},
-				noticeInstance: {
-					content: '',
-					countdown: 5,
-					confirmText: '我已知晓（5s）'
 				}
-
 			}
 		},
 		onLoad(options) {
-			this.noticeInit()
+			console.log(options);
-
 			
 			this.Invoicing.orderSerialNumber = options.orderId
 			this.orderId = options.orderId
 			this.Invoicing.customerId = options.customerId
 			let realAmount = options.payRealAmount 
-			console.log(realAmount, '++++++++++++')
+			console.log(realAmount,'++++++++++++')
 			this.code = options.code
 			if (options.code == 2) {
 				this.getchange(realAmount)
@@ -155,30 +135,6 @@
 
 		},
 		methods: {
-			noticeInit() {
-				let timer = setInterval(() => {
-					this.noticeInstance.countdown--
-					if (this.noticeInstance.countdown == 0) {
-						this.noticeInstance.confirmText = '我已知晓'
-						clearInterval(timer)
-						return
-					}
-					this.noticeInstance.confirmText = `我已知晓（${this.noticeInstance.countdown}s）`
-				}, 1000)
-				let text =
-					'本网站及与其链接网站仅提供求职、招聘及其它与此相关联之服务。个人招聘及其它与此相关联之服务。个人cccccccccccccccccccccccccccc招聘及其它与此相关联之服务。个人用户、企业用户和人力资源机构用户行为本网站及与其链接网站仅提供求职、招聘及其它与此相关联之服务。个人用户、企业用户和人力资源机构用户行为必须受以下所列条款制约，如若不接受该协议，则不能成为本网站用必须受以下所列条款制约，如若不接受该协议，则不能成为本网站用户，接受本声明之条款，表明你将遵守本协议之规定。该协议一经接受立即生效。本网站保留更新本协议，之后再通知客户的权力。如果您对本网站声明有关本协议的任何更改都是不可接受的，这样您享有的相关资格与服务即被取消;否则本网站将默认您的行为构成对本协议更改的接受。'
-				this.noticeInstance.content = text + text + text + text
-				this.$refs.popup.open('center')
-			},
-			back() {
-				uni.navigateBack()
-			},
-			iKnow() {
-				if (this.noticeInstance.countdown) {
-					return
-				}
-				this.$refs.popup.close()
-			},
 			backtodetail() {
 				uni.switchTab({
 					url: '../../pages/tabbar/order/orderList/orderList'
@@ -200,9 +156,7 @@
 				if (this.code == 1) {
 					console.log('这里是发布')
 					console.log(this.Invoicing)
-					financelApi.save(Object.assign(this.Invoicing, {
+					financelApi.save( Object.assign(this.Invoicing,{invoicAmount:this.realAmount}) ).then((res) => {
-						invoicAmount: this.realAmount
-					})).then((res) => {
 						if (res.code == 20000) {
 							if (res.data != null && res.data.remark != null) {
 								uni.showToast({
@@ -225,9 +179,7 @@
 					})
 				} else if (this.code == 2) {
 					console.log('这里是更新')
-					financelApi.orderUpdate(Object.assign(this.Invoicing, {
+					financelApi.orderUpdate(Object.assign(this.Invoicing,{invoicAmount:this.realAmount})).then((res) => {
-						invoicAmount: this.realAmount
-					})).then((res) => {
 						console.log(res)
 						if (res.code == 20000) {
 							if (res.data != null && res.data.remark != null) {
@@ -256,69 +208,6 @@
 </script>
 
 <style>
-		
-	.tip{
-		
-	}
-	.notice {
-		position: relative;
-		padding: 50rpx;
-		width: 600rpx;
-		height: 900rpx;
-		border-radius: 25rpx;
-		background: #fff;
-	}
-
-	.notice>view:nth-of-type(1) {
-		font-size: 36rpx;
-		text-align: center;
-	}
-
-	.notice>view:nth-of-type(2) {
-		margin-top: 30rpx;
-		overflow-y: auto;
-		padding-left: 16rpx;
-		height: 70%;
-		font-size: 28rpx;
-	}
-
-	.button-group {
-		position: absolute;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		height: 100rpx;
-		/* background-color: pink; */
-	}
-
-	.button-group::before {
-		content: "";
-		position: absolute;
-		top: 0;
-		left: 50%;
-		transform: translateX(-50%);
-		width: 90%;
-		height: 1rpx;
-		background: #d3d3d370;
-	}
-
-	.button-group::after {
-		content: "";
-		position: absolute;
-		top: 20rpx;
-		left: 50%;
-		width: 1rpx;
-		height: 60rpx;
-		background: #d3d3d370;
-	}
-
-	.button-group>view {
-		display: inline-block;
-		width: 50%;
-		text-align: center;
-		line-height: 100rpx;
-	}
-
 	.fixed-group {
 		display: flex;
 		justify-content: flex-start;

pages/tabbar/home/home.vue

@@ -155,9 +155,9 @@
 					<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
 						<image :src="item.src" style="width: 100%;"  mode="widthFix"></image>
 					</swiper-item>
-					<!-- <swiper-item>
+					<swiper-item>
 						<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
-					</swiper-item> -->
+					</swiper-item>
 				</swiper>
 				<!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
 			</view>