From d800bbd81e726c5811f11b6bdca8c1e0f99f2919 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Sat, 9 Oct 2021 18:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=B3=BB=E5=88=97=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E9=A6=96=E9=A1=B5=E5=85=AC=E5=91=8A=E8=BD=AE=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   6 +
 pages/business/order/list.vue                 |   9 +-
 pages/index/activity/confirm.vue              |  98 +++--
 pages/index/index/index.vue                   |  12 +-
 pages/order/cashier/cashier.vue               | 413 +++++++++---------
 pages/order/confirm/confirm.vue               |  69 +--
 pages/order/pointconfirm/confirm.vue          |  77 ++--
 pages/user/my/center.vue                      |   2 -
 .../u-column-notice/u-column-notice.vue       | 410 +++++++++--------
 .../components/u-notice-bar/u-notice-bar.vue  |   2 +-
 10 files changed, 572 insertions(+), 526 deletions(-)

diff --git a/manifest.json b/manifest.json
index 694577e..1ac35bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -124,6 +124,12 @@
         },
         "usingComponents" : true,
         "permission" : {}
+        // "plugins" : {
+        //     "live-player-plugin" : {
+        //         "version" : "1.3.2", //最新直播组件版本号
+        //         "provider" : "wx2b03c6e691cd7370" //直播appid
+        //     }
+        // }
     },
     "mp-alipay" : {
         "usingComponents" : true
diff --git a/pages/business/order/list.vue b/pages/business/order/list.vue
index bb974e7..03f456c 100644
--- a/pages/business/order/list.vue
+++ b/pages/business/order/list.vue
@@ -20,15 +20,16 @@
 								<view class="info">
 									<view class="lf-font-26 lf-color-333 lf-line-2">{{ item.items[0].item_name }}</view>
 									<view class="lf-row-between" style="line-height: 1;">
-										<text class="lf-font-24 lf-color-777">{{ item.payment.amount }}件；{{ item.items[0].item_meta.specs_text }}</text>
-										<text class="lf-font-32 lf-font-bold" style="color: #F63434;">¥{{ item.payment.amount_yuan }}</text>
+										<text class="lf-font-24 lf-color-777">{{ item.count }}件；{{ item.items[0].item_meta.specs_text }}</text>
+										<!-- <text class="lf-font-32 lf-font-bold" style="color: #F63434;" v-if="item.payment != null">¥{{ item.payment.amount_yuan }}</text> -->
+										<text class="lf-font-32 lf-font-bold" style="color: #F63434;">¥{{ item.items[0].unit_price }}</text>
 									</view>
 								</view>
 							</view>
 							<view class="order-num">
 								<view class="deliver" v-if="item.status_text == '待发货'" @click="deliver(item.order_no)">发货</view>
 								<view v-else>{{ item.status_text }}</view>
-								<view style="color: #F63434;" @click="removeOrder(item.order_no, tab_index, index)">删除订单</view>
+								<view style="color: #F63434;" @click="removeOrder(item.order_no, tab_index, index)">取消订单</view>
 							</view>
 						</view>
 						<lf-nocontent src="/static/images/empty.png" v-if="tab_item.list.length <= 0"></lf-nocontent>
@@ -213,7 +214,7 @@
 			removeOrder(order_no, parentIndex, childIndex){
 				uni.showModal({
 					title: '温馨提示',
-					content: '确定删除该订单吗？',
+					content: '确定取消该订单吗？',
 					success: result => {
 						if(result.confirm){
 							this.$http.post({
diff --git a/pages/index/activity/confirm.vue b/pages/index/activity/confirm.vue
index c11ac47..1a37dd6 100644
--- a/pages/index/activity/confirm.vue
+++ b/pages/index/activity/confirm.vue
@@ -22,7 +22,8 @@
 			return {
 				name: '',
 				phone: '',
-				activity_id: 0
+				activity_id: 0,
+				clickContinue: true
 			}
 		},
 		onLoad(e){
@@ -31,53 +32,60 @@
 		},
 		methods: {
 			confirm(){
-				if(!this.name || !this.phone) return this.$msg('请将信息补充完整');
-				
-				this.$http
-				    .post({
-				        api: 'api/activity/apply',
-						data: {
-							activity_id: this.activity_id,
-							name: this.name,
-							phone: this.phone
-						},
-						header: {
-						    Authorization: this.$cookieStorage.get('user_token')
-						},
-				    })
-				    .then(res => {
-				        if (res.data.code == 200) {
-				            if (res.data.status) {
-				        		this.$msg('报名成功').then(() => {
-				        			this.$toBack();
-				        		})
-				            } else {
-				                wx.showModal({
-				                    content: res.data.message || '人数爆满,请稍后重试!',
-				                    showCancel: false,
+				if(this.clickContinue == true) {
+					this.clickContinue = false;
+					if(!this.name || !this.phone) return this.$msg('请将信息补充完整');
+					
+					this.$http
+					    .post({
+					        api: 'api/activity/apply',
+							data: {
+								activity_id: this.activity_id,
+								name: this.name,
+								phone: this.phone
+							},
+							header: {
+							    Authorization: this.$cookieStorage.get('user_token')
+							},
+					    })
+					    .then(res => {
+					        if (res.data.code == 200) {
+					            if (res.data.status) {
+									this.clickContinue = true;
+					        		this.$msg('报名成功').then(() => {
+					        			this.$toBack();
+					        		})
+					            } else {
+									this.clickContinue = true;
+					                wx.showModal({
+					                    content: res.data.message || '人数爆满,请稍后重试!',
+					                    showCancel: false,
+										success: (res) => {
+											this.$toBack();
+										}
+					                });
+					            }
+					        } else {
+								this.clickContinue = true;
+					            wx.showModal({
+					                content: res.data.message || '人数爆满,请稍后重试!',
+					                showCancel: false,
 									success: (res) => {
 										this.$toBack();
 									}
-				                });
-				            }
-				        } else {
-				            wx.showModal({
-				                content: res.data.message || '人数爆满,请稍后重试!',
-				                showCancel: false,
-								success: (res) => {
-									this.$toBack();
-								}
-				            });
-				        }
-				        wx.hideLoading();
-				    })
-				    .catch(() => {
-				        wx.hideLoading();
-				        wx.showModal({
-				            content: '请求失败',
-				            showCancel: false
-				        });
-				    });
+					            });
+					        }
+					        wx.hideLoading();
+					    })
+					    .catch(() => {
+							this.clickContinue = true;
+					        wx.hideLoading();
+					        wx.showModal({
+					            content: '请求失败',
+					            showCancel: false
+					        });
+					    });
+				}
 			}
 		}
 	}
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index c91919c..ce0b255 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -28,8 +28,9 @@
 					<!-- 今日头条 -->
 					<view class="fuwu-tips" v-if="item.name == 'micro_page_componet_article_-' || item.name == 'micro_page_componet_article_|'">
 						<view class="fuwu-tips-title">今日头条</view>
-						<view>
-							<text class="fuwu-tips-desc1">{{ item.title }}</text>
+						<view style="width: 100%;height: 100%;">
+							<!-- <text class="fuwu-tips-desc1">{{ item.title }}</text> -->
+							<u-notice-bar type="none" :volume-icon="false" mode="vertical" :list="item.value"></u-notice-bar>
 							<!-- <text class="fuwu-tips-desc1">线上商城全场限时包邮</text>
 							<text class="fuwu-tips-desc2">(部分品牌满额包邮)</text> -->
 						</view>
@@ -73,7 +74,7 @@
 		</view>
 		<!-- 悬浮购物车入口 -->
 		<view class="fixed-right">
-			<view class="fixed-cart fixed-live" hover-class="lf-opacity" @click="$msg('敬请期待')">
+			<view class="fixed-cart fixed-live" hover-class="lf-opacity" @click="goLive()">
 				<text class="lf-iconfont icon-zhibo icon-text"></text>
 				<text class="tips">直播间</text>
 			</view>
@@ -268,6 +269,11 @@
 		},
         // 方法，需要将小程序的方法都放到这个里面
         methods: {
+			goLive() {
+				wx.navigateTo({
+				    url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=1`
+				})
+			},
 			getAlertAd(){
 				this.$http.get({
 					api: '/api/ad'
diff --git a/pages/order/cashier/cashier.vue b/pages/order/cashier/cashier.vue
index ab0a1c7..487d289 100644
--- a/pages/order/cashier/cashier.vue
+++ b/pages/order/cashier/cashier.vue
@@ -20,15 +20,18 @@
 								</view>
 							</template>
 						</countdown-timer> -->
-						<countdown-time minute="5" second="0" :showDay="false" :showHour="false" color="#FF9D9D" splitorColor="#FF9D9D">
-							
+						<countdown-time minute="5" second="0" :showDay="false" :showHour="false" color="#FF9D9D"
+							splitorColor="#FF9D9D">
+
 						</countdown-time>
 					</view>
 				</view>
 			</view>
-			<label class="card lf-row-between" v-for="(item, index) in pay_list" :key="index" style="padding: 16rpx 40rpx;">
+			<label class="card lf-row-between" v-for="(item, index) in pay_list" :key="index"
+				style="padding: 16rpx 40rpx;">
 				<view>
-					<text class="lf-iconfont lf-font-50 lf-text-vertical" :class="item.icon" :style="{color: item.color}"></text>
+					<text class="lf-iconfont lf-font-50 lf-text-vertical" :class="item.icon"
+						:style="{color: item.color}"></text>
 					<text class="lf-m-l-10 lf-font-28 lf-color-222">{{ item.name }}</text>
 				</view>
 				<radio-group @change="checkChange($event, index)">
@@ -50,7 +53,7 @@
 			countdownTime,
 			lfPayPassword
 		},
-		data(){
+		data() {
 			return {
 				pay_list: [{
 					name: '余额支付',
@@ -58,7 +61,7 @@
 					type: 'balance',
 					checked: false,
 					color: '#15716E'
-				},{
+				}, {
 					name: '微信支付',
 					icon: 'icon-weixinzhifu',
 					type: 'wx_lite',
@@ -72,10 +75,11 @@
 				token: '',
 				balance_sum: 0,
 				show_pw: false,
-				user_pw: ''
+				user_pw: '',
+				clickContinue: true
 			}
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.token = this.$cookieStorage.get('user_token');
 			this.amount = options.amount;
 			this.order_no = options.order_no;
@@ -83,7 +87,7 @@
 		},
 		methods: {
 			// 获取余额
-			getBalanceSum(){
+			getBalanceSum() {
 				this.$http.get({
 					api: 'api/users/balance/sum',
 					header: {
@@ -94,11 +98,11 @@
 				})
 			},
 			// 改变支付方式
-			checkChange(event, current){
+			checkChange(event, current) {
 				let list = this.pay_list.map((item, index) => {
-					if(index == current){
+					if (index == current) {
 						item.checked = true;
-					}else{
+					} else {
 						item.checked = false;
 					}
 					return item;
@@ -106,238 +110,251 @@
 				this.pay_list = list;
 			},
 			// 倒计时结束
-			dateFinish(){
+			dateFinish() {
 				console.log("倒计时结束");
 				this.is_date_finish = true;
-				this.$msg('订单超时', {icon: 'error'}).then(() => {
+				this.$msg('订单超时', {
+					icon: 'error'
+				}).then(() => {
 					this.$toBack();
 				})
 			},
 			// 支付密码输入完成
-			payComfirm(event){
+			payComfirm(event) {
 				this.user_pw = event;
 				this.confirm();
 			},
 			// 支付
-			confirm(){
-				if(this.is_date_finish) return this.$msg('订单超时未支付');
-				let channel = '';
-				this.pay_list.map(item => {
-				   if(item.checked){
-					   channel = item.type;
-				   }
-				})
-				if(channel == 'balance' && !this.user_pw){
-					this.show_pw = true;
-					return;
+			confirm() {
+				if (this.clickContinue == true) {
+					this.clickContinue = false;
+					if (this.is_date_finish) return this.$msg('订单超时未支付');
+					let channel = '';
+					this.pay_list.map(item => {
+						if (item.checked) {
+							channel = item.type;
+						}
+					})
+					if (channel == 'balance' && !this.user_pw) {
+						this.show_pw = true;
+						return;
+					}
+
+					this.getOpenid().then(res => {
+						var data = {
+							channel: 'wx_lite',
+							openid: res,
+							order_no: this.order_no,
+							balance: 0
+						};
+						if (channel == 'balance') {
+							data.pay_pwd = this.user_pw;
+							data.balance = Number(this.amount);
+							data.channel = 'wx_lite';
+						}
+
+						this.$http.post({
+							api: `api/shopping/order/charge`,
+							data: data,
+							header: {
+								Authorization: this.token
+							}
+						}).then(res => {
+							res = res.data;
+							if (res.status) {
+								// this.formId =  e.detail.formId || '';
+								if (res.data.name == 'balance') {
+									this.balanceCharge();
+								} else {
+									this.newcharge(true, res.data.charge);
+								}
+							} else {
+								this.newcharge(false, res.message);
+								this.show_pw = false;
+							}
+							this.clickContinue = true;
+						})
+					}).catch(() => {
+						this.clickContinue = true;
+						this.show_pw = false;
+						this.setData({
+							loading: false
+						});
+						wx.showModal({
+							content: '支付失败',
+							showCancel: false
+						});
+					});
 				}
-				
-				this.getOpenid().then(res => {
-				  var data = {
-				    channel: 'wx_lite',
-				    openid: res,
-				    order_no: this.order_no,
-				    balance: 0
-				  };
-				  if(channel == 'balance'){
-					  data.pay_pwd = this.user_pw;
-					  data.balance = Number(this.amount);
-					  data.channel = 'wx_lite';
-				  }
-					
-				  this.$http.post({
-				    api: `api/shopping/order/charge`,
-				    data: data,
-				    header: {
-				      Authorization: this.token
-				    }
-				  }).then(res => {
-				    res = res.data;
-				    if (res.status) {
-				      // this.formId =  e.detail.formId || '';
-				     if (res.data.name == 'balance') {
-				        this.balanceCharge();
-				      } else {
-				        this.newcharge(true, res.data.charge);
-				      }
-				    } else {
-				      this.newcharge(false, res.message);
-					  this.show_pw = false;
-				    }
-				  })
-				}).catch(() => {
-					this.show_pw = false;
-				  this.setData({
-				    loading: false
-				  });
-				  wx.showModal({
-				    content: '支付失败',
-				    showCancel: false
-				  });
-				});
 			},
 			// 获取openid
 			getOpenid() {
-			  return new Promise((resolve, reject) => {
-			    wx.login({
-			      success: res => {
-			        this.$http.get({
-			          api: `api/oauth/miniprogram/openid`,
-			          data: {
-			            code: res.code
-			          }
-			        }).then(res => {
-			          res = res.data;
-			          resolve(res.data.openid);
-			        }).catch(() => {
-			          reject('获取openid失败');
-			        });
-			      },
-			      fail: () => {
-			        wx.showModal({
-			          content: "接口请求失败",
-			          showCancel: false
-			        });
-			      }
-			    });
-			  });
+				return new Promise((resolve, reject) => {
+					wx.login({
+						success: res => {
+							this.$http.get({
+								api: `api/oauth/miniprogram/openid`,
+								data: {
+									code: res.code
+								}
+							}).then(res => {
+								res = res.data;
+								resolve(res.data.openid);
+							}).catch(() => {
+								reject('获取openid失败');
+							});
+						},
+						fail: () => {
+							wx.showModal({
+								content: "接口请求失败",
+								showCancel: false
+							});
+						}
+					});
+				});
 			},
 			// 新版支付
 			newcharge(success, charge) {
-			  if (success) {
-			    var that = this;
-			    if (charge.pay_scene == 'test') {
-			      wx.showModal({
-			        content: '不支持模拟支付',
-			        showCancel: false
-			      });
-			      this.setData({
-			        loading: false
-			      });
-			    } else {
-			      wx.requestPayment({
-			        "timeStamp": charge.credential.wechat.timeStamp,
-			        "nonceStr": charge.credential.wechat.nonceStr,
-			        "package": charge.credential.wechat.package,
-			        "signType": charge.credential.wechat.signType,
-			        "paySign": charge.credential.wechat.paySign,
-			        success: res => {
-			          if (res.errMsg == 'requestPayment:ok') {
-			            this.setData({
-			              loading: false
-			            });
-			            // wx.redirectTo({
-			            //   url: `/pages/store/success/success?order_no=${that.order_no}&amount=${that.amount}&channel=${that.channel}&formId=${this.formId}` //&charge_id=${charge.charge_id} charge_id 支付测试使用
-			            // });
-						uni.redirectTo({
-							url: '/pages/aboutpay/paystate?payState=1&amount='+ that.amount
-						})
-			          } else {
-			            wx.showModal({
-			              content: '调用支付失败！',
-			              showCancel: false
-			            });
-			          }
-			        },
-			        fail: err => {
-			          this.setData({
-			            loading: false
-			          });
-			
-			          if (err.errMsg == 'requestPayment:fail cancel') {
-			            // wx.redirectTo({
-			            //   url: `/pages/order/detail/detail?no=${that.order_no}`
-			            // });
-						uni.redirectTo({
-							url: '/pages/order/index/onlineorder'
-						})
-			          } else {
-			            wx.showModal({
-			              content: '调用支付失败！',
-			              showCancel: false
-			            });
-			          }
-			        }
-			      });
-			    }
-			  } else {
-			    this.setData({
-			      loading: false
-			    });
-			    wx.showModal({
-			      content: charge || '请求支付失败，请重试！',
-			      showCancel: false
-			    });
-				this.user_pw = '';
-			  }
+				if (success) {
+					var that = this;
+					if (charge.pay_scene == 'test') {
+						wx.showModal({
+							content: '不支持模拟支付',
+							showCancel: false
+						});
+						this.setData({
+							loading: false
+						});
+					} else {
+						wx.requestPayment({
+							"timeStamp": charge.credential.wechat.timeStamp,
+							"nonceStr": charge.credential.wechat.nonceStr,
+							"package": charge.credential.wechat.package,
+							"signType": charge.credential.wechat.signType,
+							"paySign": charge.credential.wechat.paySign,
+							success: res => {
+								if (res.errMsg == 'requestPayment:ok') {
+									this.setData({
+										loading: false
+									});
+									// wx.redirectTo({
+									//   url: `/pages/store/success/success?order_no=${that.order_no}&amount=${that.amount}&channel=${that.channel}&formId=${this.formId}` //&charge_id=${charge.charge_id} charge_id 支付测试使用
+									// });
+									uni.redirectTo({
+										url: '/pages/aboutpay/paystate?payState=1&amount=' + that
+											.amount
+									})
+								} else {
+									wx.showModal({
+										content: '调用支付失败！',
+										showCancel: false
+									});
+								}
+							},
+							fail: err => {
+								this.setData({
+									loading: false
+								});
+
+								if (err.errMsg == 'requestPayment:fail cancel') {
+									// wx.redirectTo({
+									//   url: `/pages/order/detail/detail?no=${that.order_no}`
+									// });
+									uni.redirectTo({
+										url: '/pages/order/index/onlineorder'
+									})
+								} else {
+									wx.showModal({
+										content: '调用支付失败！',
+										showCancel: false
+									});
+								}
+							}
+						});
+					}
+				} else {
+					this.setData({
+						loading: false
+					});
+					wx.showModal({
+						content: charge || '请求支付失败，请重试！',
+						showCancel: false
+					});
+					this.user_pw = '';
+				}
 			},
 			// 纯余额支付
 			balanceCharge() {
-			  this.setData({
-			    loading: false
-			  });
-			  // wx.redirectTo({
-			  //   url: `/pages/store/success/success?order_no=${this.order_no}&amount=${this.amount}&channel=${this.channel}&formId=${this.formId}`
-			  // });
-			  uni.redirectTo({
-			  	url: '/pages/aboutpay/paystate?payState=1&amount='+ this.amount
-			  })
+				this.setData({
+					loading: false
+				});
+				// wx.redirectTo({
+				//   url: `/pages/store/success/success?order_no=${this.order_no}&amount=${this.amount}&channel=${this.channel}&formId=${this.formId}`
+				// });
+				uni.redirectTo({
+					url: '/pages/aboutpay/paystate?payState=1&amount=' + this.amount
+				})
 			},
-			setData: function (obj) {
-			  let that = this;
-			  let keys = [];
-			  let val, data;
-			  Object.keys(obj).forEach(function (key) {
-			    keys = key.split('.');
-			    val = obj[key];
-			    data = that.$data;
-			    keys.forEach(function (key2, index) {
-			      if (index + 1 == keys.length) {
-			        that.$set(data, key2, val);
-			      } else {
-			        if (!data[key2]) {
-			          that.$set(data, key2, {});
-			        }
-			      }
-			
-			      data = data[key2];
-			    });
-			  });
+			setData: function(obj) {
+				let that = this;
+				let keys = [];
+				let val, data;
+				Object.keys(obj).forEach(function(key) {
+					keys = key.split('.');
+					val = obj[key];
+					data = that.$data;
+					keys.forEach(function(key2, index) {
+						if (index + 1 == keys.length) {
+							that.$set(data, key2, val);
+						} else {
+							if (!data[key2]) {
+								that.$set(data, key2, {});
+							}
+						}
+
+						data = data[key2];
+					});
+				});
 			}
 		}
 	}
 </script>
 
 <style>
-	page{
+	page {
 		background-color: #F8F8F8;
 	}
 </style>
 <style lang="scss" scoped="scoped">
-	.content{
+	.content {
 		padding: 30rpx 32rpx;
 		width: 750rpx;
 		height: max-content;
 		box-sizing: border-box;
-		.card{
+
+		.card {
 			width: 100%;
 			height: max-content;
 			padding: 30rpx 40rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
-			&:nth-child(n+2){
+
+			&:nth-child(n+2) {
 				margin-top: 30rpx;
 			}
-			.symbol{
+
+			.symbol {
 				color: #15716E;
 				font-size: 32rpx;
 			}
-			.price{
+
+			.price {
 				font-size: 72rpx;
 				color: #15716E;
 				font-weight: bold;
 			}
-			.tips{
+
+			.tips {
 				font-size: 24rpx;
 				color: #FF9D9D;
 				display: flex;
@@ -345,7 +362,7 @@
 			}
 		}
 	}
-	
+
 	.fixed-agreement {
 		position: fixed;
 		bottom: 5vh;
@@ -354,8 +371,8 @@
 		left: calc(50% - 84rpx);
 		width: 168rpx;
 	}
-	
-	.fixed-btn{
+
+	.fixed-btn {
 		position: fixed;
 		bottom: 10vh;
 		left: calc(50% - 275rpx);
diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue
index 06173e9..2dd8f79 100644
--- a/pages/order/confirm/confirm.vue
+++ b/pages/order/confirm/confirm.vue
@@ -174,7 +174,8 @@
 				coupon_index: null,
 				goods_type: 1,
 				itemsPrice: 0, // 商品金额(所有商品之和，但不包括额外费用及优惠) 
-				totalPrice: 0 // 合计价格
+				totalPrice: 0 ,// 合计价格
+				clickContinue: true
 			}
 		},
 		computed: {
@@ -325,39 +326,43 @@
 			// 提交订单
 			confirm(){
 				console.log(this.address)
-				if(this.address == null) {
-					this.$msg('请先添加收货地址!');
-					return
-				}
-				let par = {
-					order_no: this.order_detail.order.order_no,
-					pick_self: this.mode, // 0 配送，1自提
-					address_id: this.address.id,
-					note: this.value
-				}
-				// 是否选择了优惠券 TODO 优惠券id是否传对？
-				if(this.coupon_index != null){
-					par.coupon_id = this.order_detail.coupons[this.coupon_index].id;
-				}
-				
-				this.$http.post({
-					api: 'api/shopping/order/confirm',
-					data: par,
-					header: {
-						Authorization: this.token
+				if(this.clickContinue == true) {
+					this.clickContinue = false;
+					if(this.address == null) {
+						this.$msg('请先添加收货地址!');
+						return
 					}
-				}).then(res => {
-					console.log("`````````", res);
-					if(res.data.code == 200 || res.data.code == true){
-						let order = res.data.data.order;
-						let url = '/pages/order/cashier/cashier';
-						url += '?amount='+ this.totalPrice;
-						url += '&order_no='+ order.order_no;
-						this.$url(url, {type: 'redirect'});
-					}else{
-						this.$msg(res.data.message);
+					let par = {
+						order_no: this.order_detail.order.order_no,
+						pick_self: this.mode, // 0 配送，1自提
+						address_id: this.address.id,
+						note: this.value
 					}
-				})
+					// 是否选择了优惠券 TODO 优惠券id是否传对？
+					if(this.coupon_index != null){
+						par.coupon_id = this.order_detail.coupons[this.coupon_index].id;
+					}
+					
+					this.$http.post({
+						api: 'api/shopping/order/confirm',
+						data: par,
+						header: {
+							Authorization: this.token
+						}
+					}).then(res => {
+						if(res.data.code == 200 || res.data.code == true){
+							let order = res.data.data.order;
+							let url = '/pages/order/cashier/cashier';
+							url += '?amount='+ this.totalPrice;
+							url += '&order_no='+ order.order_no;
+							this.$url(url, {type: 'redirect'});
+							this.clickContinue = true;
+						}else{
+							this.$msg(res.data.message);
+							this.clickContinue = true;
+						}
+					})
+				}
 			},
 			// 选择优惠券
 			couponChange(event){
diff --git a/pages/order/pointconfirm/confirm.vue b/pages/order/pointconfirm/confirm.vue
index 4851d18..d44885c 100644
--- a/pages/order/pointconfirm/confirm.vue
+++ b/pages/order/pointconfirm/confirm.vue
@@ -160,7 +160,8 @@
 				show_coupon: false,
 				coupon_index: null,
 				goods_type: 0,
-				params: {}
+				params: {},
+				clickContinue: true
 			}
 		},
 		computed: {
@@ -267,42 +268,48 @@
 			},
 			// 提交订单
 			confirm(){
-				console.log(this.address)
-				if(this.address == null) {
-					this.$msg('请先添加收货地址!');
-					return
-				}
-				this.$http.post({
-					api: 'api/shopping/order/confirm/point',
-					data: {
-						order_no: this.order_detail.order.order_no,
-						// discount_id: 0, // 优惠券id? TODO
-						pick_self: this.mode, // 0 配送，1自提
-						address_id: this.address.id,
-						note: this.value
-					},
-					header: {
-						Authorization: this.token
+				if(this.clickContinue == true) {
+					this.clickContinue = false;
+					console.log(this.address)
+					if(this.address == null) {
+						this.$msg('请先添加收货地址!');
+						return
 					}
-				}).then(res => {
-					if(res.data.code == 200 || res.data.code == true){
-						console.log(res.data.data)
-						if(res.data.data.order.payable_freight_yuan > 0) {
-							let order = res.data.data.order;
-							let url = '/pages/order/cashier/cashier';
-							url += '?amount='+ order.payable_freight_yuan;
-							url += '&order_no='+ order.order_no;
-							this.$url(url, {type: 'redirect'});
-						}else {
-							this.$msg('兑换成功')
-							setTimeout(() => {
-								this.$toBack()
-							},1000)
+					this.$http.post({
+						api: 'api/shopping/order/confirm/point',
+						data: {
+							order_no: this.order_detail.order.order_no,
+							// discount_id: 0, // 优惠券id? TODO
+							pick_self: this.mode, // 0 配送，1自提
+							address_id: this.address.id,
+							note: this.value
+						},
+						header: {
+							Authorization: this.token
 						}
-					}else{
-						this.$msg(res.data.message);
-					}
-				})
+					}).then(res => {
+						if(res.data.code == 200 || res.data.code == true){
+							console.log(res.data.data)
+							if(res.data.data.order.payable_freight_yuan > 0) {
+								let order = res.data.data.order;
+								let url = '/pages/order/cashier/cashier';
+								url += '?amount='+ order.payable_freight_yuan;
+								url += '&order_no='+ order.order_no;
+								this.$url(url, {type: 'redirect'});
+								this.clickContinue = true;
+							}else {
+								this.clickContinue = true;
+								this.$msg('兑换成功')
+								setTimeout(() => {
+									this.$toBack()
+								},1000)
+							}
+						}else{
+							this.$msg(res.data.message);
+							this.clickContinue = true;
+						}
+					})
+				}
 			},
 			// 选择优惠券
 			couponChange(event){
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index a399480..a6de28a 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -82,14 +82,12 @@
 					</view>
 					<view class="order-children" @click="$url('/pages/order/index/onlineorder?current=2')">
 						<view>
-							<view class="function-tag" v-if="centerInfo.paidCount != 0 && $isRight(centerInfo)">{{centerInfo.paidCount}}</view>
 							<view class="lf-iconfont lf-font-50 icon-31daifahuo"></view>
 						</view>
 						<view class="lf-color-black lf-font-28 lf-m-t-20">待发货</view>
 					</view>
 					<view class="order-children" @click="$url('/pages/order/index/onlineorder?current=3')">
 						<view>
-							<view class="function-tag" v-if="centerInfo.deliveredCount != 0 && $isRight(centerInfo)">{{centerInfo.deliveredCount}}</view>
 							<view class="lf-iconfont lf-font-50 icon-daishouhuo"></view>
 						</view>
 						<view class="lf-color-black lf-font-28 lf-m-t-20">待收货</view>
diff --git a/uview-ui/components/u-column-notice/u-column-notice.vue b/uview-ui/components/u-column-notice/u-column-notice.vue
index dd8bd31..f3d158a 100644
--- a/uview-ui/components/u-column-notice/u-column-notice.vue
+++ b/uview-ui/components/u-column-notice/u-column-notice.vue
@@ -1,237 +1,235 @@
 <template>
-	<view
-		class="u-notice-bar"
-		:style="{
+	<view class="u-notice-bar" :style="{
 			background: computeBgColor,
 			padding: padding
-		}"
-		:class="[
+		}" :class="[
 			type ? `u-type-${type}-light-bg` : ''
-		]"
-	>
+		]">
 		<view class="u-icon-wrap">
-			<u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor"></u-icon>
+			<u-icon class="u-left-icon" v-if="volumeIcon" name="volume-fill" :size="volumeSize" :color="computeColor">
+			</u-icon>
 		</view>
-		<swiper :disable-touch="disableTouch" @change="change" :autoplay="autoplay && playState == 'play'" :vertical="vertical" circular :interval="duration" class="u-swiper">
+		<swiper :disable-touch="disableTouch" @change="change" :autoplay="autoplay && playState == 'play'"
+			:vertical="vertical" circular :interval="duration" class="u-swiper">
 			<swiper-item v-for="(item, index) in list" :key="index" class="u-swiper-item">
-				<view
-					class="u-news-item u-line-1"
-					:style="[textStyle]"
-					@tap="click(index)"
-					:class="['u-type-' + type]"
-				>
-					{{ item }}
+				<view class="u-news-item u-line-1" :style="[textStyle]" @tap="click(index,item)"
+					:class="['u-type-' + type]">
+					{{ item.associate.title }}
 				</view>
 			</swiper-item>
 		</swiper>
 		<view class="u-icon-wrap">
-			<u-icon @click="getMore" class="u-right-icon" v-if="moreIcon" name="arrow-right" :size="26" :color="computeColor"></u-icon>
-			<u-icon @click="close" class="u-right-icon" v-if="closeIcon" name="close" :size="24" :color="computeColor"></u-icon>
+			<u-icon @click="getMore" class="u-right-icon" v-if="moreIcon" name="arrow-right" :size="26"
+				:color="computeColor"></u-icon>
+			<u-icon @click="close" class="u-right-icon" v-if="closeIcon" name="close" :size="24" :color="computeColor">
+			</u-icon>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	props: {
-		// 显示的内容，数组
-		list: {
-			type: Array,
-			default() {
-				return [];
+	export default {
+		props: {
+			// 显示的内容，数组
+			list: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			// 显示的主题，success|error|primary|info|warning
+			type: {
+				type: String,
+				default: 'warning'
+			},
+			// 是否显示左侧的音量图标
+			volumeIcon: {
+				type: Boolean,
+				default: true
+			},
+			// 是否显示右侧的右箭头图标
+			moreIcon: {
+				type: Boolean,
+				default: false
+			},
+			// 是否显示右侧的关闭图标
+			closeIcon: {
+				type: Boolean,
+				default: false
+			},
+			// 是否自动播放
+			autoplay: {
+				type: Boolean,
+				default: true
+			},
+			// 文字颜色，各图标也会使用文字颜色
+			color: {
+				type: String,
+				default: ''
+			},
+			// 背景颜色
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			// 滚动方向，row-水平滚动，column-垂直滚动
+			direction: {
+				type: String,
+				default: 'row'
+			},
+			// 是否显示
+			show: {
+				type: Boolean,
+				default: true
+			},
+			// 字体大小，单位rpx
+			fontSize: {
+				type: [Number, String],
+				default: 26
+			},
+			// 滚动一个周期的时间长，单位ms
+			duration: {
+				type: [Number, String],
+				default: 2000
+			},
+			// 音量喇叭的大小
+			volumeSize: {
+				type: [Number, String],
+				default: 34
+			},
+			// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
+			speed: {
+				type: Number,
+				default: 160
+			},
+			// 水平滚动时，是否采用衔接形式滚动
+			isCircular: {
+				type: Boolean,
+				default: true
+			},
+			// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
+			mode: {
+				type: String,
+				default: 'horizontal'
+			},
+			// 播放状态，play-播放，paused-暂停
+			playState: {
+				type: String,
+				default: 'play'
+			},
+			// 是否禁止用手滑动切换
+			// 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
+			disableTouch: {
+				type: Boolean,
+				default: true
+			},
+			// 通知的边距
+			padding: {
+				type: [Number, String],
+				default: '18rpx 24rpx'
 			}
 		},
-		// 显示的主题，success|error|primary|info|warning
-		type: {
-			type: String,
-			default: 'warning'
-		},
-		// 是否显示左侧的音量图标
-		volumeIcon: {
-			type: Boolean,
-			default: true
-		},
-		// 是否显示右侧的右箭头图标
-		moreIcon: {
-			type: Boolean,
-			default: false
-		},
-		// 是否显示右侧的关闭图标
-		closeIcon: {
-			type: Boolean,
-			default: false
-		},
-		// 是否自动播放
-		autoplay: {
-			type: Boolean,
-			default: true
-		},
-		// 文字颜色，各图标也会使用文字颜色
-		color: {
-			type: String,
-			default: ''
-		},
-		// 背景颜色
-		bgColor: {
-			type: String,
-			default: ''
-		},
-		// 滚动方向，row-水平滚动，column-垂直滚动
-		direction: {
-			type: String,
-			default: 'row'
-		},
-		// 是否显示
-		show: {
-			type: Boolean,
-			default: true
-		},
-		// 字体大小，单位rpx
-		fontSize: {
-			type: [Number, String],
-			default: 26
-		},
-		// 滚动一个周期的时间长，单位ms
-		duration: {
-			type: [Number, String],
-			default: 2000
-		},
-		// 音量喇叭的大小
-		volumeSize: {
-			type: [Number, String],
-			default: 34
-		},
-		// 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度
-		speed: {
-			type: Number,
-			default: 160
-		},
-		// 水平滚动时，是否采用衔接形式滚动
-		isCircular: {
-			type: Boolean,
-			default: true
-		},
-		// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
-		mode: {
-			type: String,
-			default: 'horizontal'
-		},
-		// 播放状态，play-播放，paused-暂停
-		playState: {
-			type: String,
-			default: 'play'
-		},
-		// 是否禁止用手滑动切换
-		// 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
-		disableTouch: {
-			type: Boolean,
-			default: true
-		},
-		// 通知的边距
-		padding: {
-			type: [Number, String],
-			default: '18rpx 24rpx'
-		}
-	},
-	computed: {
-		// 计算字体颜色，如果没有自定义的，就用uview主题颜色
-		computeColor() {
-			if (this.color) return this.color;
-			// 如果是无主题，就默认使用content-color
-			else if(this.type == 'none') return '#606266';
-			else return this.type;
-		},
-		// 文字内容的样式
-		textStyle() {
-			let style = {};
-			if (this.color) style.color = this.color;
-			else if(this.type == 'none') style.color = '#606266';
-			style.fontSize = this.fontSize + 'rpx';
-			return style;
-		},
-		// 垂直或者水平滚动
-		vertical() {
-			if(this.mode == 'horizontal') return false;
-			else return true;
-		},
-		// 计算背景颜色
-		computeBgColor() {
-			if (this.bgColor) return this.bgColor;
-			else if(this.type == 'none') return 'transparent';
-		}
-	},
-	data() {
-		return {
-			// animation: false
-		};
-	},
-	methods: {
-		// 点击通告栏
-		click(index) {
-			this.$emit('click', index);
-		},
-		// 点击关闭按钮
-		close() {
-			this.$emit('close');
-		},
-		// 点击更多箭头按钮
-		getMore() {
-			this.$emit('getMore');
+		computed: {
+			// 计算字体颜色，如果没有自定义的，就用uview主题颜色
+			computeColor() {
+				if (this.color) return this.color;
+				// 如果是无主题，就默认使用content-color
+				else if (this.type == 'none') return '#606266';
+				else return this.type;
+			},
+			// 文字内容的样式
+			textStyle() {
+				let style = {};
+				if (this.color) style.color = this.color;
+				else if (this.type == 'none') style.color = '#606266';
+				style.fontSize = this.fontSize + 'rpx';
+				return style;
+			},
+			// 垂直或者水平滚动
+			vertical() {
+				if (this.mode == 'horizontal') return false;
+				else return true;
+			},
+			// 计算背景颜色
+			computeBgColor() {
+				if (this.bgColor) return this.bgColor;
+				else if (this.type == 'none') return 'transparent';
+			}
 		},
-		change(e) {
-			let index = e.detail.current;
-			if(index == this.list.length - 1) {
-				this.$emit('end');
+		data() {
+			return {
+				// animation: false
+			};
+		},
+		methods: {
+			// 点击通告栏
+			click(index, item) {
+				this.$emit('click', index);
+				this.$url(item.link)
+				console.log(item.link)
+			},
+			// 点击关闭按钮
+			close() {
+				this.$emit('close');
+			},
+			// 点击更多箭头按钮
+			getMore() {
+				this.$emit('getMore');
+			},
+			change(e) {
+				let index = e.detail.current;
+				if (index == this.list.length - 1) {
+					this.$emit('end');
+				}
 			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
+	@import "../../libs/css/style.components.scss";
 
-.u-notice-bar {
-	width: 100%;
-	@include vue-flex;
-	align-items: center;
-	justify-content: center;
-	flex-wrap: nowrap;
-	padding: 18rpx 24rpx;
-	overflow: hidden;
-}
+	.u-notice-bar {
+		width: 100%;
+		@include vue-flex;
+		align-items: center;
+		justify-content: center;
+		flex-wrap: nowrap;
+		padding: 18rpx 24rpx;
+		overflow: hidden;
+	}
 
-.u-swiper {
-	font-size: 26rpx;
-	height: 32rpx;
-	@include vue-flex;
-	align-items: center;
-	flex: 1;
-	margin-left: 12rpx;
-}
+	.u-swiper {
+		font-size: 26rpx;
+		height: 32rpx;
+		@include vue-flex;
+		align-items: center;
+		flex: 1;
+		margin-left: 12rpx;
+	}
 
-.u-swiper-item {
-	@include vue-flex;
-	align-items: center;
-	overflow: hidden;
-}
+	.u-swiper-item {
+		@include vue-flex;
+		align-items: center;
+		overflow: hidden;
+	}
 
-.u-news-item {
-	overflow: hidden;
-}
+	.u-news-item {
+		overflow: hidden;
+	}
 
-.u-right-icon {
-	margin-left: 12rpx;
-	/* #ifndef APP-NVUE */
-	display: inline-flex;		
-	/* #endif */
-	align-items: center;
-}
+	.u-right-icon {
+		margin-left: 12rpx;
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+	}
 
-.u-left-icon {
-	/* #ifndef APP-NVUE */
-	display: inline-flex;		
-	/* #endif */
-	align-items: center;
-}
+	.u-left-icon {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		align-items: center;
+	}
 </style>
diff --git a/uview-ui/components/u-notice-bar/u-notice-bar.vue b/uview-ui/components/u-notice-bar/u-notice-bar.vue
index 41a6cc4..8480cd0 100644
--- a/uview-ui/components/u-notice-bar/u-notice-bar.vue
+++ b/uview-ui/components/u-notice-bar/u-notice-bar.vue
@@ -131,7 +131,7 @@ export default {
 		// 滚动方向，horizontal-水平滚动，vertical-垂直滚动
 		mode: {
 			type: String,
-			default: 'horizontal'
+			default: 'vertical'
 		},
 		// 是否显示
 		show: {