From 119d92ea09a9e5d6a24967dfbe723df9e88028a3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 19 Jan 2022 14:07:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=90=E7=A7=81=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E9=A1=B5=E9=9D=A2=E7=AD=89=E5=A4=9A=E4=B8=AA=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml              |   4 +
 .idea/misc.xml                   |   6 ++
 .idea/modules.xml                |   8 ++
 .idea/shuinishop.iml             |  12 +++
 .idea/vcs.xml                    |   6 ++
 .idea/workspace.xml              | 173 +++++++++++++++++++++++++++++++
 common/http.api.js               |   2 +-
 pages.json                       |  25 ++++-
 pages/order/confirmation.vue     |  45 ++++----
 pages/pay/payment/uppayment.vue  |  81 +++++++++++++--
 pages/protocol/Privacy.vue       |  58 +++++++++++
 pages/protocol/index.vue         |  50 +++++++++
 pages/tabBar/cart/cart.vue       |   6 +-
 pages/user/address/edit/edit.vue |  68 +++++++++++-
 pages/user/invoice/edit/edit.vue |  84 +++++++++++++--
 15 files changed, 585 insertions(+), 43 deletions(-)
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/shuinishop.iml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 pages/protocol/Privacy.vue
 create mode 100644 pages/protocol/index.vue

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..e904b98
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/shuinishop.iml" filepath="$PROJECT_DIR$/.idea/shuinishop.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/shuinishop.iml b/.idea/shuinishop.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/shuinishop.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..0666e95
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="d92a373b-a34b-42e4-9751-2d18d522a715" name="默认更改列表" comment="">
+      <change beforePath="$PROJECT_DIR$/common/http.api.js" beforeDir="false" afterPath="$PROJECT_DIR$/common/http.api.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/order/confirmation.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order/confirmation.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/pay/payment/uppayment.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pay/payment/uppayment.vue" afterDir="false" />
+    </list>
+    <ignored path="$PROJECT_DIR$/.tmp/" />
+    <ignored path="$PROJECT_DIR$/temp/" />
+    <ignored path="$PROJECT_DIR$/tmp/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/App.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="360">
+              <caret line="12" column="37" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/user/setting/setting.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="510">
+              <caret line="107" column="42" selection-start-line="107" selection-start-column="42" selection-end-line="107" selection-end-column="42" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/tabBar/user/user.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="370">
+              <caret line="190" column="18" lean-forward="true" selection-start-line="190" selection-start-column="18" selection-end-line="190" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>vuex_user</find>
+    </findStrings>
+    <replaceStrings>
+      <replace />
+    </replaceStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="-2204" />
+    <option name="y" value="163" />
+    <option name="width" value="1550" />
+    <option name="height" value="838" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="shuinishop" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="shuinishop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="shuinishop" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../hberp/hb_client" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="d92a373b-a34b-42e4-9751-2d18d522a715" name="默认更改列表" comment="" />
+      <created>1639965828906</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1639965828906</updated>
+      <workItem from="1639965830415" duration="2224000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="2224000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-2568" y="-8" width="2576" height="1416" extended-state="6" />
+    <layout>
+      <window_info id="Favorites" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24980299" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/App.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="12" column="37" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/setting/setting.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="510">
+          <caret line="107" column="42" selection-start-line="107" selection-start-column="42" selection-end-line="107" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/tabBar/user/user.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="370">
+          <caret line="190" column="18" lean-forward="true" selection-start-line="190" selection-start-column="18" selection-end-line="190" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/common/http.api.js b/common/http.api.js
index 7485bf8..4f70481 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -34,7 +34,7 @@ const install = (Vue, vm) => {
 	let removeFromCart = (id) => vm.$u.get(`/index.php/api/car/delete_one/id/${id}/`);//
 	let addtoCart =(id, num)=> vm.$u.get(`index.php/api/car/add/id/${id}/num/${num}`);//加入购物车
 	let addOrder = (params={})=>vm.$u.post('/index.php/api/car/submit', params);
-	let getFreight = (id)=>vm.$u.get(`/index.php/api/car/get_freight/shop_uid/${id}`);//获取商家免运费价格
+	let getFreight = (params={})=>vm.$u.post(`/index.php/api/car/get_freight/shop_uid`,params);//获取商家免运费价格
 	let getOrders = (params={})=>vm.$u.get('index.php/api/order/index', params);//我的订单
 	let qxdd = (id)=>vm.$u.get(`index.php/api/order/cancel_order/id/${id}`);//取消订单
 	let qrsh = (id)=>vm.$u.get(`/index.php/api/order/confirm/id/${id}`);//收货确认
diff --git a/pages.json b/pages.json
index 17ad990..1931ff6 100644
--- a/pages.json
+++ b/pages.json
@@ -313,6 +313,24 @@
                 "enablePullDownRefresh": false
             }
             
+        },{
+            "path" : "pages/protocol/index",
+            "style" : {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText":"用户服务协议",
+				"navigationBarBackgroundColor":"#f8f8f8",
+				"backgroundColorTop":"#f3f3f3",
+				"backgroundColorBottom":"#ffffff"
+			}
+        },{
+            "path" : "pages/protocol/Privacy",
+            "style" : {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText":"隐私政策",
+				"navigationBarBackgroundColor":"#f8f8f8",
+				"backgroundColorTop":"#f3f3f3",
+				"backgroundColorBottom":"#ffffff"
+			}
         }
     ],
 	"globalStyle": {
@@ -353,5 +371,10 @@
 				"text": "我的"
 			}
 		]
-	}
+	},
+	"permission": {
+	    "scope.userLocation": {
+	      "desc": "获取信息为了页面更好的展示，请确认授权"
+	    }
+	  }
 }
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index eafb40d..60140a1 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -162,7 +162,7 @@
 
 			};
 		},
-		async onLoad(){
+	  onLoad(){
 			//页面显示时，加载订单信息
 			try {
 			    const value = uni.getStorageSync('buylist');
@@ -179,11 +179,9 @@
 						}
 						this.freights['shop'+this.buylist[i].shopId].total = this.freights['shop'+this.buylist[i].shopId].total + thisprice;
 			        }
-			        let ret = await this.getFreights(); //获取运费计算规则
-			      
-			        // this.deduction = this.int / 100;
-			        //console.log(this.freights)
-			        this.calFreight() //计算运费
+			        // let ret = await this.getFreights(); //获取运费计算规则
+					// this.calFreight() //计算运费
+			        this.getFreights(); //2021/12/20更改获取运费	
 			        this.sumPrice = this.goodsPrice - this.deduction + parseFloat(this.freight);
 					
 			    }
@@ -197,7 +195,7 @@
 				key: 'selectAddress',
 				success: (e) => {
 					this.recinfo = e.data;
-					debugger;
+					// debugger;
 					console.log(this.recinfo)
 				}
 			})
@@ -223,24 +221,35 @@
 		methods: {
 			calFreight(){
 				for(let key in this.freights){
-					var base_l = this.freights[key].base.split('|')
+					/* var base_l = this.freights[key].base.split('|')
 					if(this.freights[key].total>=base_l[0]){
 						this.freights[key].freight = 0
 					}else{
 						this.freights[key].freight=base_l[1]
-					}
-					this.freight = this.freight + this.freights[key].freight
+					} */
+					debugger;
+					this.freight = this.freight + this.freights[key].freight;
 				}
 			},
 			async getFreights() {
-				var that = this
-				
-				 for(let key  in that.freights){
-				        let shopId = key.replace('shop','')
-						let ret = await that.$u.api.getFreight(shopId);
-						that.freights[key].base = ret.data
-						
-				  }
+				var that = this;
+				 /*// that.calFreight() */
+				 let goods = []
+				 for(let i=0;i<that.buylist.length;i++){
+				 	goods.push({
+				 		shopid: that.buylist[i].id,
+				 		num: that.buylist[i]._num
+				 	})
+				 }
+				 let datas = {
+				 	uid: that.vuex_user.uid,
+				 	data:goods
+				 }
+				 debugger;
+				  await that.$u.api.getFreight(datas).then(res=>{
+					  that.freight = res.data;
+					  that.sumPrice = that.goodsPrice - that.deduction + parseFloat(that.freight);
+				  });
 			},
 			clearOrder() {
 				uni.removeStorage({
diff --git a/pages/pay/payment/uppayment.vue b/pages/pay/payment/uppayment.vue
index 1a1e75d..45b60c7 100644
--- a/pages/pay/payment/uppayment.vue
+++ b/pages/pay/payment/uppayment.vue
@@ -29,7 +29,7 @@
 					<view class="nominal">汇款信息:</view>
 					<view class="nominal">请通过电汇的方式支付货款，将汇款凭证拍照上传</view>
 					<view class="text">
-						账户名称: 中国建材检验认证集团股份有限公司
+						账户名称: 中国国检测试控股集团股份有限公司
 					</view>
 					<view class="text">
 						开户行: 工商银行北京管庄支行
@@ -49,9 +49,28 @@
 					:limit="5" ref="files" :auto-upload="false" @select="select" />
 			</view>
 		</view>
-		<view class="pay">
-			<view class="btn" @tap="upImg()">提交</view>
+		<view class="protocol">
+			<view class="checkbox-box">
+				<view class="checkbox" @tap="selected">
+					<view :class="[portocol?'on':'']"></view>
+				</view>
+				<view class="text">我已阅读并同意<view class="linkText" @tap="protocolIndex">《用户服务协议》</view>和<view class="linkText" @tap="protocolPrivacy">《隐私政策》</view>
+				</view>
+			</view>
+			<!-- <checkbox v-model="portocol"></checkbox> -->
+			
 		</view>
+		<view class="pay">
+			<view v-if="portocol" class="btn on" @tap="upImg()">
+				提交
+			</view>
+			<view v-else class="btn">
+				提交
+			</view>
+		</view>
+		<!-- <view class="pay">
+			<view class="btn" @tap="upImg()">提交</view>
+		</view> -->
 	</view>
 </template>
 
@@ -68,7 +87,8 @@
 				name: 'file',
 				url: '',
 				filepath: [],
-				rpath:[]
+				rpath:[],
+				portocol:false
 			};
 		},
 		onLoad(e) {
@@ -89,6 +109,19 @@
 			})
 		},
 		methods: {
+			selected(){
+				this.portocol = !this.portocol;
+			},
+			protocolIndex(){
+				uni.navigateTo({
+					url:"../../protocol/index"
+				})
+			},
+			protocolPrivacy(){
+				uni.navigateTo({
+					url:"../../protocol/Privacy"
+				})
+			},
 			doDeposit() {
 				//模板模拟支付，实际应用请调起微信/支付宝
 				uni.showLoading({
@@ -311,7 +344,39 @@
 			}
 		}
 	}
-
+	.protocol{
+		font-size: 26upx;
+		.checkbox-box{
+			display: flex;
+			align-items: center;
+			padding-bottom: 20upx;
+			justify-content: center;
+			.checkbox{
+				width: 35upx;
+				height: 35upx;
+				border-radius: 100%;
+				border: solid 2upx #f06c7a;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				.on{
+					width: 25upx;
+					height: 25upx;
+					border-radius: 100%;
+					background-color: #f06c7a;
+				}
+			}
+			.text{
+				display: flex;
+				margin-left: 10upx;
+				.linkText{
+					color: #007AFF;
+				}
+			}
+		}
+		
+	}
+	
 	.pay {
 		margin-top: 20upx;
 		width: 100%;
@@ -327,10 +392,12 @@
 			justify-content: center;
 			align-items: center;
 			color: #fff;
-			background-color: #f06c7a;
+			background-color: #CCCCCC;
 			box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2);
 		}
-
+		.on{
+			background-color: #f06c7a;
+		}
 		.tis {
 			margin-top: 10upx;
 			width: 100%;
diff --git a/pages/protocol/Privacy.vue b/pages/protocol/Privacy.vue
new file mode 100644
index 0000000..10fcb72
--- /dev/null
+++ b/pages/protocol/Privacy.vue
@@ -0,0 +1,58 @@
+<template>
+	<view class="protocolWrap">
+		<view>本指引是小程序开发者（以下简称“开发者”）为处理你的个人信息而制定。</view>
+		<view class="firstLevel">
+			<view class="levelTitle">开发者处理的信息</view>
+			<view>根据法律规定，开发者仅处理实现小程序功能所必要的信息。</view>
+			<view>为了注册、登录小程序以及页面的展示，开发者收集你的用户信息（微信昵称、头像、性别、地区）。</view>
+			<view>开发者收集你的上传的图片，用于核实对应订单流程。</view>
+			<view>开发者收集你的发票相关信息，用于提供发票回执。</view>
+		</view>
+		<view class="firstLevel">
+			<view class="levelTitle">你的权益</view>
+			<view>开发者承诺，除法律法规另有规定外，开发者对你的信息的保存期限应当为实现处理目的所必要的最短时间。</view>
+			<view>关于授权问题，你可以通过以下路径：小程序主页右上角“…”—“设置”—点击特定信息—点击“不允许”，撤回对开发者的授权。</view>
+			<view>关于你的个人信息，你可以通过以下方式与开发者联系，行使查阅、复制、更正、删除等法定权利。</view>
+		</view>
+		<view class="firstLevel">
+			<view class="levelTitle">开发者对信息的存储</view>
+			<view>开发者承诺，除法律法规另有规定外，开发者对你的信息的保存期限应当为实现处理目的所必要的最短时间。</view>
+		</view>
+		<view class="firstLevel">
+			<view class="levelTitle">信息的使用规则</view>
+			<view>开发者将会在本指引所明示的用途内使用收集的信息</view>
+			<view>如开发者使用你的信息超出本指引目的或合理范围，开发者必须在变更使用目的或范围前，再次以微信方式告知并征得你的明示同意。</view>
+		</view>
+		<view class="firstLevel">
+			<view class="levelTitle">信息对外提供</view>
+			<view>开发者承诺，不会主动共享或转让你的信息至任何第三方，如存在确需共享或转让时，开发者应当直接征得或确认第三方征得你的单独同意。</view>
+			<view>开发者承诺，不会对外公开披露你的信息，如必须公开披露时，开发者应当向你告知公开披露的目的、披露信息的类型及可能涉及的信息，并征得你的单独同意。</view>
+			<view>你认为开发者未遵守上述约定，或有其他的投诉建议、或未成年人个人信息保护相关问题，可通过以下方式与开发者联系；或者向微信进行投诉。</view>
+			<view>微信号： wcharles_6003</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.protocolWrap{
+		color: #333333;
+		padding: 20upx 30upx;
+		font-size: 32upx;
+		line-height: 46upx;
+		.firstLevel{
+			margin-top: 20upx;
+			.levelTitle{
+				font-weight: bold;
+				text-indent: 0em;
+			}
+			view{
+				text-indent: 2em;
+			}
+		}
+	}
+	
+</style>
diff --git a/pages/protocol/index.vue b/pages/protocol/index.vue
new file mode 100644
index 0000000..fd4cc8f
--- /dev/null
+++ b/pages/protocol/index.vue
@@ -0,0 +1,50 @@
+<template>
+	<view class="protocolWrap">
+		<view class="firstLevel">
+			1、用户在本小程序注册后。用户应当妥善保存其账户信息和密码，由于用户泄密所导致如用户发现他人冒用或盗用其账户或密码，或其账户存在其他未经合法授权使用之情形，应立即以有效方式通知本公司。用户理解并同意本公司有权根据用户的通知、请求或依据判断，采取相应的行动或措施，包括但不限于冻结账户、限制账户功能等，本公司对采取上述行动所导致的损失不承担除法律有明确规定外的责任。
+		</view>
+		<view class="firstLevel">
+			2、用户在使用本服务时须遵守法律法规，不得利用本服务从事违法违规行为，包括但不限于：
+			<view>
+				（1）发布、传送、传播、储存危害国家安全统一、破坏社会稳定、违反公序良俗、侮辱、诽谤、淫秽、暴力以及任何违反国家法律法规的内容；
+			</view>
+			<view>
+				（2）发布、传送、传播、储存侵害他人知识产权、商业秘密等合法权利的内容；
+			</view>
+			<view>
+				（3）恶意虚构事实、隐瞒真相以误导、欺骗他人；
+			</view>
+			<view>
+				（4）发布、传送、传播广告信息及垃圾信息；
+			</view>
+			<view>	
+				（5）其他法律法规禁止的行为。
+			</view>
+			
+			
+		</view>
+		<view class="firstLevel">
+			3、用户不得利用本服务进行任何有损本公司及其关联企业之权利、利益及商誉，或其他用户合法权利之行为。
+		</view>
+		<view class="firstLevel">
+			4、用户不得从事任何利用本公司平台系统漏洞进行有损其他用户、本公司或互联网安全的行为。
+		</view>
+	</view>
+	
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.protocolWrap{
+		    padding: 20upx 30upx;
+		    font-size: 32upx;
+		    line-height: 46upx;
+			.firstLevel{
+				color: #333333;
+				margin-bottom: 20upx;
+			}
+	}
+	
+</style>
diff --git a/pages/tabBar/cart/cart.vue b/pages/tabBar/cart/cart.vue
index a804dc1..5dbd116 100644
--- a/pages/tabBar/cart/cart.vue
+++ b/pages/tabBar/cart/cart.vue
@@ -67,7 +67,7 @@
 			</view>
 			<!-- <view class="delBtn" @tap="deleteList" v-if="selectedList.length>0">删除</view> -->
 			<view class="settlement">
-				<view class="sum">合计:<view class="money">￥{{sumPrice}}</view></view>
+				<view class="sum">总计(不含运费):<view class="money">￥{{sumPrice}}</view></view>
 				<view class="btn" @tap="toConfirmation">结算
 				<!-- ({{selectedList.length}}) -->
 				</view>
@@ -607,12 +607,12 @@
 			align-items: center;
 		}
 		.settlement{
-			width: 60%;
+			width: 75%;
 			display: flex;
 			justify-content: flex-end;
 			align-items: center;
 			.sum{
-				width: 60%;
+				width: 75%;
 				font-size: 28upx;
 				margin-right: 10upx;
 				display: flex;
diff --git a/pages/user/address/edit/edit.vue b/pages/user/address/edit/edit.vue
index 69292d5..775242d 100644
--- a/pages/user/address/edit/edit.vue
+++ b/pages/user/address/edit/edit.vue
@@ -48,8 +48,20 @@
 				</view>
 			</view>
 		</view>
-		<view class="save" @tap="save">
-			<view class="btn">
+		<view class="protocol">
+			<view class="checkbox-box">
+				<view class="checkbox" @tap="selected">
+					<view :class="[portocol?'on':'']"></view>
+				</view>
+				<view class="text">我已阅读并同意<view class="linkText" @tap="protocolIndex">《用户服务协议》</view>和<view class="linkText" @tap="protocolPrivacy">《隐私政策》</view>
+				</view>
+			</view>
+		</view>
+		<view class="save">
+			<view v-if="portocol"  class="btn on" @tap="save">
+				保存地址
+			</view>
+			<view v-else class="btn">
 				保存地址
 			</view>
 		</view>
@@ -74,10 +86,24 @@
 				often: false,
 				cityPickerValue: [0, 0, 1],
 				themeColor: '#007AFF',
+				portocol:false
 				// region:{label:"请点击选择地址",value:[],cityCode:""}
 			};
 		},
 		methods: {
+			selected(){
+				this.portocol = !this.portocol;
+			},
+			protocolIndex(){
+				uni.navigateTo({
+					url:"../../../protocol/index"
+				})
+			},
+			protocolPrivacy(){
+				uni.navigateTo({
+					url:"../../../protocol/Privacy"
+				})
+			},
 			onCancel(e) {
 				console.log(e)
 			},
@@ -236,6 +262,39 @@
 	};
 </script>
 <style lang="scss">
+	.protocol{
+		font-size: 26upx;
+		.checkbox-box{
+			display: flex;
+			align-items: center;
+			padding-bottom: 120upx;
+			justify-content: center;
+			.checkbox{
+				width: 35upx;
+				height: 35upx;
+				border-radius: 100%;
+				border: solid 2upx #f06c7a;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				.on{
+					width: 25upx;
+					height: 25upx;
+					border-radius: 100%;
+					background-color: #f06c7a;
+				}
+			}
+			.text{
+				display: flex;
+				margin-left: 10upx;
+				.linkText{
+					color: #007AFF;
+				}
+			}
+		}
+		
+	}
+	
 	.save {
 		view {
 			display: flex;
@@ -254,7 +313,7 @@
 			width: 70%;
 			height: 80upx;
 			border-radius: 80upx;
-			background-color: #f06c7a;
+			background-color: #cccccc;
 			color: #fff;
 			justify-content: center;
 			align-items: center;
@@ -269,6 +328,9 @@
 
 			font-size: 30upx;
 		}
+		.on{
+			background-color: #f06c7a;
+		}
 	}
 
 	.content {
diff --git a/pages/user/invoice/edit/edit.vue b/pages/user/invoice/edit/edit.vue
index b227af8..36e5526 100644
--- a/pages/user/invoice/edit/edit.vue
+++ b/pages/user/invoice/edit/edit.vue
@@ -6,7 +6,7 @@
 					发票抬头
 				</view>
 				<view class="input">
-					<input placeholder="请输入" type="text" v-model="name" />
+					<input placeholder="请输入发票抬头" type="text" v-model="name" />
 				</view>
 			</view>
 			<view class="row">
@@ -14,7 +14,7 @@
 					单位税号
 				</view>
 				<view class="input">
-					<input placeholder="请输入" type="text" v-model="duty_paragraph" />
+					<input placeholder="请输入单位税号" type="text" v-model="duty_paragraph" />
 				</view>
 			</view>
 			<view class="row">
@@ -22,7 +22,7 @@
 					注册地址
 				</view>
 				<view class="input">
-					<input placeholder="请输入" type="text" v-model="address" />
+					<input placeholder="请输入注册地址" type="text" v-model="address" />
 				</view>
 			</view>
 			<view class="row">
@@ -30,7 +30,7 @@
 					注册电话
 				</view>
 				<view class="input">
-					<input placeholder="请输入" type="text" v-model="telphone" />
+					<input placeholder="请输入注册电话" type="text" v-model="telphone" />
 				</view>
 			</view>
 			<view class="row">
@@ -38,7 +38,7 @@
 					开户银行
 				</view>
 				<view class="input">
-					<input placeholder="请输入" type="text" v-model="bank" />
+					<input placeholder="请输入开户银行" type="text" v-model="bank" />
 				</view>
 			</view>
 			<view class="row">
@@ -46,7 +46,7 @@
 					账号
 				</view>
 				<view class="input">
-					<input placeholder="请输入" type="text" v-model="account" />
+					<input placeholder="请输入开户银行" type="text" v-model="account" />
 				</view>
 			</view>
 			<view class="row">
@@ -96,8 +96,22 @@
 				</view>
 			</view>
 		</view>
-		<view class="save" @tap="save">
-			<view class="btn">
+		<view class="protocol">
+			<view class="checkbox-box">
+				<view class="checkbox" @tap="selected">
+					<view :class="[portocol?'on':'']"></view>
+				</view>
+				<view class="text">我已阅读并同意<view class="linkText" @tap="protocolIndex">《用户服务协议》</view>和<view class="linkText" @tap="protocolPrivacy">《隐私政策》</view>
+				</view>
+			</view>
+			<!-- <checkbox v-model="portocol"></checkbox> -->
+			
+		</view>
+		<view class="save">
+			<view v-if="portocol" class="btn on" @tap="save">
+				保存
+			</view>
+			<view v-else class="btn">
 				保存
 			</view>
 		</view>
@@ -128,10 +142,24 @@
 				user:'',
 				invoice_tel:'',
 				invoice_addr:'',
+				portocol:false,
 				// region:{label:"请点击选择地址",value:[],cityCode:""}
 			};
 		},
 		methods: {
+			selected(){
+				this.portocol = !this.portocol;
+			},
+			protocolIndex(){
+				uni.navigateTo({
+					url:"../../../protocol/index"
+				})
+			},
+			protocolPrivacy(){
+				uni.navigateTo({
+					url:"../../../protocol/Privacy"
+				})
+			},
 			onCancel(e) {
 				console.log(e)
 			},
@@ -256,6 +284,39 @@
 	};
 </script>
 <style lang="scss">
+	.protocol{
+		font-size: 26upx;
+		.checkbox-box{
+			display: flex;
+			align-items: center;
+			padding-bottom: 120upx;
+			justify-content: center;
+			.checkbox{
+				width: 35upx;
+				height: 35upx;
+				border-radius: 100%;
+				border: solid 2upx #f06c7a;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				.on{
+					width: 25upx;
+					height: 25upx;
+					border-radius: 100%;
+					background-color: #f06c7a;
+				}
+			}
+			.text{
+				display: flex;
+				margin-left: 10upx;
+				.linkText{
+					color: #007AFF;
+				}
+			}
+		}
+		
+	}
+	
 	.save {
 		view {
 			display: flex;
@@ -274,7 +335,7 @@
 			width: 70%;
 			height: 80upx;
 			border-radius: 80upx;
-			background-color: #f06c7a;
+			background-color: #CCCCCC;
 			color: #fff;
 			justify-content: center;
 			align-items: center;
@@ -289,12 +350,15 @@
 
 			font-size: 30upx;
 		}
+		.on{
+			background-color: #f06c7a;
+		}
 	}
 
 	.content {
 		display: flex;
 		flex-wrap: wrap;
-		padding-bottom: 120upx;
+		// padding-bottom: 120upx;
 
 		view {
 			display: flex;