gjy 3 vuotta sitten
vanhempi
commit
f1529c5950

+ 0 - 62
components/colorui/main.css

@@ -87,7 +87,6 @@ image.loading::after {
  ==================== */
  ==================== */
 
 
 switch,
 switch,
-checkbox,
 radio {
 radio {
 	position: relative;
 	position: relative;
 }
 }
@@ -132,35 +131,8 @@ switch.checked::before {
 
 
 /* #ifndef MP-ALIPAY */
 /* #ifndef MP-ALIPAY */
 radio::before,
 radio::before,
-checkbox::before {
-	font-family: "cuIcon";
-	content: "\e645";
-	position: absolute;
-	color: #ffffff !important;
-	top: 50%;
-	margin-top: -8px;
-	right: 5px;
-	font-size: 32upx;
-	line-height: 16px;
-	pointer-events: none;
-	transform: scale(1, 1);
-	transition: all 0.3s ease-in-out 0s;
-	z-index: 9;
-}
-
 radio .wx-radio-input,
 radio .wx-radio-input,
-checkbox .wx-checkbox-input,
 radio .uni-radio-input,
 radio .uni-radio-input,
-checkbox .uni-checkbox-input {
-	margin: 0;
-	width: 24px;
-	height: 24px;
-}
-
-checkbox.round .wx-checkbox-input,
-checkbox.round .uni-checkbox-input {
-	border-radius: 100upx;
-}
 
 
 /* #endif */
 /* #endif */
 
 
@@ -222,11 +194,9 @@ switch.radius .uni-switch-input::before {
 
 
 switch .wx-switch-input::before,
 switch .wx-switch-input::before,
 radio.radio::before,
 radio.radio::before,
-checkbox .wx-checkbox-input::before,
 radio .wx-radio-input::before,
 radio .wx-radio-input::before,
 switch .uni-switch-input::before,
 switch .uni-switch-input::before,
 radio.radio::before,
 radio.radio::before,
-checkbox .uni-checkbox-input::before,
 radio .uni-radio-input::before {
 radio .uni-radio-input::before {
 	display: none;
 	display: none;
 }
 }
@@ -276,10 +246,8 @@ radio.radio .uni-radio-input-checked::after {
 }
 }
 
 
 switch.red[checked] .wx-switch-input.wx-switch-input-checked,
 switch.red[checked] .wx-switch-input.wx-switch-input-checked,
-checkbox.red[checked] .wx-checkbox-input,
 radio.red[checked] .wx-radio-input,
 radio.red[checked] .wx-radio-input,
 switch.red.checked .uni-switch-input.uni-switch-input-checked,
 switch.red.checked .uni-switch-input.uni-switch-input-checked,
-checkbox.red.checked .uni-checkbox-input,
 radio.red.checked .uni-radio-input {
 radio.red.checked .uni-radio-input {
 	background-color: #e54d42 !important;
 	background-color: #e54d42 !important;
 	border-color: #e54d42 !important;
 	border-color: #e54d42 !important;
@@ -287,10 +255,8 @@ radio.red.checked .uni-radio-input {
 }
 }
 
 
 switch.orange[checked] .wx-switch-input,
 switch.orange[checked] .wx-switch-input,
-checkbox.orange[checked] .wx-checkbox-input,
 radio.orange[checked] .wx-radio-input,
 radio.orange[checked] .wx-radio-input,
 switch.orange.checked .uni-switch-input,
 switch.orange.checked .uni-switch-input,
-checkbox.orange.checked .uni-checkbox-input,
 radio.orange.checked .uni-radio-input {
 radio.orange.checked .uni-radio-input {
 	background-color: #f37b1d !important;
 	background-color: #f37b1d !important;
 	border-color: #f37b1d !important;
 	border-color: #f37b1d !important;
@@ -298,10 +264,8 @@ radio.orange.checked .uni-radio-input {
 }
 }
 
 
 switch.yellow[checked] .wx-switch-input,
 switch.yellow[checked] .wx-switch-input,
-checkbox.yellow[checked] .wx-checkbox-input,
 radio.yellow[checked] .wx-radio-input,
 radio.yellow[checked] .wx-radio-input,
 switch.yellow.checked .uni-switch-input,
 switch.yellow.checked .uni-switch-input,
-checkbox.yellow.checked .uni-checkbox-input,
 radio.yellow.checked .uni-radio-input {
 radio.yellow.checked .uni-radio-input {
 	background-color: #fbbd08 !important;
 	background-color: #fbbd08 !important;
 	border-color: #fbbd08 !important;
 	border-color: #fbbd08 !important;
@@ -309,10 +273,8 @@ radio.yellow.checked .uni-radio-input {
 }
 }
 
 
 switch.olive[checked] .wx-switch-input,
 switch.olive[checked] .wx-switch-input,
-checkbox.olive[checked] .wx-checkbox-input,
 radio.olive[checked] .wx-radio-input,
 radio.olive[checked] .wx-radio-input,
 switch.olive.checked .uni-switch-input,
 switch.olive.checked .uni-switch-input,
-checkbox.olive.checked .uni-checkbox-input,
 radio.olive.checked .uni-radio-input {
 radio.olive.checked .uni-radio-input {
 	background-color: #8dc63f !important;
 	background-color: #8dc63f !important;
 	border-color: #8dc63f !important;
 	border-color: #8dc63f !important;
@@ -321,14 +283,10 @@ radio.olive.checked .uni-radio-input {
 
 
 switch.green[checked] .wx-switch-input,
 switch.green[checked] .wx-switch-input,
 switch[checked] .wx-switch-input,
 switch[checked] .wx-switch-input,
-checkbox.green[checked] .wx-checkbox-input,
-checkbox[checked] .wx-checkbox-input,
 radio.green[checked] .wx-radio-input,
 radio.green[checked] .wx-radio-input,
 radio[checked] .wx-radio-input,
 radio[checked] .wx-radio-input,
 switch.green.checked .uni-switch-input,
 switch.green.checked .uni-switch-input,
 switch.checked .uni-switch-input,
 switch.checked .uni-switch-input,
-checkbox.green.checked .uni-checkbox-input,
-checkbox.checked .uni-checkbox-input,
 radio.green.checked .uni-radio-input,
 radio.green.checked .uni-radio-input,
 radio.checked .uni-radio-input {
 radio.checked .uni-radio-input {
 	background-color: #39b54a !important;
 	background-color: #39b54a !important;
@@ -338,10 +296,8 @@ radio.checked .uni-radio-input {
 }
 }
 
 
 switch.cyan[checked] .wx-switch-input,
 switch.cyan[checked] .wx-switch-input,
-checkbox.cyan[checked] .wx-checkbox-input,
 radio.cyan[checked] .wx-radio-input,
 radio.cyan[checked] .wx-radio-input,
 switch.cyan.checked .uni-switch-input,
 switch.cyan.checked .uni-switch-input,
-checkbox.cyan.checked .uni-checkbox-input,
 radio.cyan.checked .uni-radio-input {
 radio.cyan.checked .uni-radio-input {
 	background-color: #1cbbb4 !important;
 	background-color: #1cbbb4 !important;
 	border-color: #1cbbb4 !important;
 	border-color: #1cbbb4 !important;
@@ -349,10 +305,8 @@ radio.cyan.checked .uni-radio-input {
 }
 }
 
 
 switch.blue[checked] .wx-switch-input,
 switch.blue[checked] .wx-switch-input,
-checkbox.blue[checked] .wx-checkbox-input,
 radio.blue[checked] .wx-radio-input,
 radio.blue[checked] .wx-radio-input,
 switch.blue.checked .uni-switch-input,
 switch.blue.checked .uni-switch-input,
-checkbox.blue.checked .uni-checkbox-input,
 radio.blue.checked .uni-radio-input {
 radio.blue.checked .uni-radio-input {
 	background-color: #0081ff !important;
 	background-color: #0081ff !important;
 	border-color: #0081ff !important;
 	border-color: #0081ff !important;
@@ -360,10 +314,8 @@ radio.blue.checked .uni-radio-input {
 }
 }
 
 
 switch.purple[checked] .wx-switch-input,
 switch.purple[checked] .wx-switch-input,
-checkbox.purple[checked] .wx-checkbox-input,
 radio.purple[checked] .wx-radio-input,
 radio.purple[checked] .wx-radio-input,
 switch.purple.checked .uni-switch-input,
 switch.purple.checked .uni-switch-input,
-checkbox.purple.checked .uni-checkbox-input,
 radio.purple.checked .uni-radio-input {
 radio.purple.checked .uni-radio-input {
 	background-color: #6739b6 !important;
 	background-color: #6739b6 !important;
 	border-color: #6739b6 !important;
 	border-color: #6739b6 !important;
@@ -371,10 +323,8 @@ radio.purple.checked .uni-radio-input {
 }
 }
 
 
 switch.mauve[checked] .wx-switch-input,
 switch.mauve[checked] .wx-switch-input,
-checkbox.mauve[checked] .wx-checkbox-input,
 radio.mauve[checked] .wx-radio-input,
 radio.mauve[checked] .wx-radio-input,
 switch.mauve.checked .uni-switch-input,
 switch.mauve.checked .uni-switch-input,
-checkbox.mauve.checked .uni-checkbox-input,
 radio.mauve.checked .uni-radio-input {
 radio.mauve.checked .uni-radio-input {
 	background-color: #9c26b0 !important;
 	background-color: #9c26b0 !important;
 	border-color: #9c26b0 !important;
 	border-color: #9c26b0 !important;
@@ -382,10 +332,8 @@ radio.mauve.checked .uni-radio-input {
 }
 }
 
 
 switch.pink[checked] .wx-switch-input,
 switch.pink[checked] .wx-switch-input,
-checkbox.pink[checked] .wx-checkbox-input,
 radio.pink[checked] .wx-radio-input,
 radio.pink[checked] .wx-radio-input,
 switch.pink.checked .uni-switch-input,
 switch.pink.checked .uni-switch-input,
-checkbox.pink.checked .uni-checkbox-input,
 radio.pink.checked .uni-radio-input {
 radio.pink.checked .uni-radio-input {
 	background-color: #e03997 !important;
 	background-color: #e03997 !important;
 	border-color: #e03997 !important;
 	border-color: #e03997 !important;
@@ -393,10 +341,8 @@ radio.pink.checked .uni-radio-input {
 }
 }
 
 
 switch.brown[checked] .wx-switch-input,
 switch.brown[checked] .wx-switch-input,
-checkbox.brown[checked] .wx-checkbox-input,
 radio.brown[checked] .wx-radio-input,
 radio.brown[checked] .wx-radio-input,
 switch.brown.checked .uni-switch-input,
 switch.brown.checked .uni-switch-input,
-checkbox.brown.checked .uni-checkbox-input,
 radio.brown.checked .uni-radio-input {
 radio.brown.checked .uni-radio-input {
 	background-color: #a5673f !important;
 	background-color: #a5673f !important;
 	border-color: #a5673f !important;
 	border-color: #a5673f !important;
@@ -404,10 +350,8 @@ radio.brown.checked .uni-radio-input {
 }
 }
 
 
 switch.grey[checked] .wx-switch-input,
 switch.grey[checked] .wx-switch-input,
-checkbox.grey[checked] .wx-checkbox-input,
 radio.grey[checked] .wx-radio-input,
 radio.grey[checked] .wx-radio-input,
 switch.grey.checked .uni-switch-input,
 switch.grey.checked .uni-switch-input,
-checkbox.grey.checked .uni-checkbox-input,
 radio.grey.checked .uni-radio-input {
 radio.grey.checked .uni-radio-input {
 	background-color: #8799a3 !important;
 	background-color: #8799a3 !important;
 	border-color: #8799a3 !important;
 	border-color: #8799a3 !important;
@@ -415,10 +359,8 @@ radio.grey.checked .uni-radio-input {
 }
 }
 
 
 switch.gray[checked] .wx-switch-input,
 switch.gray[checked] .wx-switch-input,
-checkbox.gray[checked] .wx-checkbox-input,
 radio.gray[checked] .wx-radio-input,
 radio.gray[checked] .wx-radio-input,
 switch.gray.checked .uni-switch-input,
 switch.gray.checked .uni-switch-input,
-checkbox.gray.checked .uni-checkbox-input,
 radio.gray.checked .uni-radio-input {
 radio.gray.checked .uni-radio-input {
 	background-color: #f0f0f0 !important;
 	background-color: #f0f0f0 !important;
 	border-color: #f0f0f0 !important;
 	border-color: #f0f0f0 !important;
@@ -426,10 +368,8 @@ radio.gray.checked .uni-radio-input {
 }
 }
 
 
 switch.black[checked] .wx-switch-input,
 switch.black[checked] .wx-switch-input,
-checkbox.black[checked] .wx-checkbox-input,
 radio.black[checked] .wx-radio-input,
 radio.black[checked] .wx-radio-input,
 switch.black.checked .uni-switch-input,
 switch.black.checked .uni-switch-input,
-checkbox.black.checked .uni-checkbox-input,
 radio.black.checked .uni-radio-input {
 radio.black.checked .uni-radio-input {
 	background-color: #333333 !important;
 	background-color: #333333 !important;
 	border-color: #333333 !important;
 	border-color: #333333 !important;
@@ -437,10 +377,8 @@ radio.black.checked .uni-radio-input {
 }
 }
 
 
 switch.white[checked] .wx-switch-input,
 switch.white[checked] .wx-switch-input,
-checkbox.white[checked] .wx-checkbox-input,
 radio.white[checked] .wx-radio-input,
 radio.white[checked] .wx-radio-input,
 switch.white.checked .uni-switch-input,
 switch.white.checked .uni-switch-input,
-checkbox.white.checked .uni-checkbox-input,
 radio.white.checked .uni-radio-input {
 radio.white.checked .uni-radio-input {
 	background-color: #ffffff !important;
 	background-color: #ffffff !important;
 	border-color: #ffffff !important;
 	border-color: #ffffff !important;

+ 1 - 0
manifest.json

@@ -65,6 +65,7 @@
             },
             },
             "android" : {
             "android" : {
                 "permissions" : [
                 "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>"
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>"
                 ],
                 ],
                 "permissionExternalStorage" : {
                 "permissionExternalStorage" : {

+ 54 - 12
pageA/product/Identity_switching.vue

@@ -11,12 +11,7 @@
 						</view>
 						</view>
 						<view class="info">{{item.customerPhone}}</view>
 						<view class="info">{{item.customerPhone}}</view>
 						<label>
 						<label>
-							<u-checkbox 
-											@change.stop="checkboxChange" 
-											v-model="item.checked" 
-											:name="item.name"
-										>设置默认</u-checkbox>
-							<checkbox :value='item.id' :checked="item.defaultFlag" @click.stop="checkBox($event,item)" ></checkbox>
+							<checkbox style='transform: scale(0.8);' :value='item.id' :checked="item.checked" @click.stop="checkBox($event,item)" ></checkbox>
 							<text>设置默认</text>
 							<text>设置默认</text>
 						</label>
 						</label>
 						
 						
@@ -51,6 +46,17 @@
 				TabCur: 0,
 				TabCur: 0,
 				current: 1,
 				current: 1,
 				checked:false,
 				checked:false,
+				goodsName:'',
+				receivePrivate:'',
+				receiveCity:'',
+				receiveArea:'',
+				minimumVolume:'',
+				basis:'',
+				buyer:'',
+				unitPrice:'',
+				receiveWarehouse:'',
+				procurementPlanType:'',
+				procurementPlan:'',
 				identityAuthenticationInfo: {
 				identityAuthenticationInfo: {
 					pageSize: 10,
 					pageSize: 10,
 					currentPage: 1,
 					currentPage: 1,
@@ -63,7 +69,18 @@
 		onShow(){
 		onShow(){
 			this.getList()
 			this.getList()
 		},
 		},
-		onLoad() {
+		onLoad(options) {
+			this.goodsName = options.goodsName
+			this.receivePrivate = options.receivePrivate
+			this.receiveCity = options.receiveCity
+			this.receiveArea = options.receiveArea
+			this.minimumVolume = options.minimumVolume
+			this.buyer = options.buyer
+			this.basis = options.basisPrice
+			this.unitPrice = options.unitPrice
+			this.receiveWarehouse = options.receiveWarehouse
+			this.procurementPlanType = options.procurementPlanType
+			this.procurementPlan=options.procurementPlanNo
 		},
 		},
 		computed: {
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 			...mapState(['hasLogin', 'userInfo'])
@@ -71,13 +88,19 @@
 		methods: {
 		methods: {
 			getList() {
 			getList() {
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
 				this.identityAuthenticationInfo.commonId = this.userInfo.id
-				console.log(12313)
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfo', {
 						pageSize: 10,
 						pageSize: 10,
 						currentPage: 1,
 						currentPage: 1,
 						commonId: this.userInfo.id
 						commonId: this.userInfo.id
 					}, 'application/json;charset=UTF-8').then(res => {
 					}, 'application/json;charset=UTF-8').then(res => {
 						if(res.data.code==200){
 						if(res.data.code==200){
+							for(var i=0;i<res.data.data.records.length;i++){
+								if(res.data.data.records[i].defaultFlag!=1){
+									res.data.data.records[i].checked=false
+								}else{
+									res.data.data.records[i].checked=true
+								}
+							}
 							this.lists = res.data.data.records
 							this.lists = res.data.data.records
 						}
 						}
 					})
 					})
@@ -89,9 +112,26 @@
 						})
 						})
 					});
 					});
 			},
 			},
-			checkBox(e){
-				this.checked=!this.checked
-				console.log(e)
+			checkBox(e,item){
+				for(var i=0;i<this.lists.length;i++){
+					this.lists[i].checked=true
+				}
+				item.checked=true
+				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', {
+						id:item.id,
+						commonId: this.userInfo.id
+					}).then(res => {
+						if(res.data.code==200){
+							// this.lists = res.data.data.records
+						}
+					})
+					.catch(res => {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					});
 			},
 			},
 			// adddriver(index) {
 			// adddriver(index) {
 			// 	if (index == 1) {
 			// 	if (index == 1) {
@@ -107,7 +147,9 @@
 			navToDetailPage(item) {
 			navToDetailPage(item) {
 				// if (index == 1) {
 				// if (index == 1) {
 					uni.navigateTo({
 					uni.navigateTo({
-						url: `/pageA/product/business_buy?id=${item.id}&customerName=${item.customerName}`
+						url: `/pageA/product/business_buy?id=${item.id}&customerName=${item.customerName}&goodsName=${this.goodsName}
+						&receivePrivate=${this.receivePrivate}&receiveCity=${this.receiveCity}&receiveArea=${this.receiveArea}&minimumVolume=${this.minimumVolume}&buyer=${this.buyer}&basisPrice=${this.basis}&unitPrice=${this.unitPrice}
+						&receiveWarehouse=${this.receiveWarehouse}&procurementPlanType=${this.procurementPlanType}&procurementPlanNo=${this.procurementPlan}`
 					})
 					})
 					},
 					},
 				// } else {
 				// } else {

+ 8 - 2
pageA/product/business_buy.vue

@@ -173,6 +173,7 @@
 				};
 				};
 			},
 			},
 			onLoad(options) {
 			onLoad(options) {
+				console.log(options)
 				this.id=options.id
 				this.id=options.id
 				this.purchaseOrder.seller = options.seller
 				this.purchaseOrder.seller = options.seller
 				this.purchaseOrder.goodsName = options.goodsName
 				this.purchaseOrder.goodsName = options.goodsName
@@ -187,7 +188,7 @@
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.procurementPlanType = options.procurementPlanType
 				this.purchaseOrder.procurementPlanType = options.procurementPlanType
-				this.purchaseOrder.procurementPlan=options.procurementPlanNo
+				this.purchaseOrder.procurementPlan=options.procurementPlan
 			},
 			},
 			computed: {
 			computed: {
 				...mapState(['hasLogin','userInfo']),
 				...mapState(['hasLogin','userInfo']),
@@ -210,7 +211,12 @@
 			methods: {
 			methods: {
 				liang(){
 				liang(){
 					uni.navigateTo({
 					uni.navigateTo({
-						url: '/pageA/product/Identity_switching'
+						url: `/pageA/product/Identity_switching?goodsName=${this.purchaseOrder.goodsName}
+						&receivePrivate=${this.purchaseOrder.receivePrivate}&receiveCity=${this.purchaseOrder.receiveCity}
+						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
+						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&unitPrice=${this.purchaseOrder.unitPrice}
+						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&procurementPlanType=${this.purchaseOrder.procurementPlanType}
+						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
 					})
 					})
 				},
 				},
 				commit(){
 				commit(){

+ 1 - 0
pageD/identity/companyIdentity.vue

@@ -253,6 +253,7 @@
 			license() {
 			license() {
 				var that = this
 				var that = this
 				wx.chooseImage({
 				wx.chooseImage({
+					sourceType: ['camera','album'],
 					success: function(res) {
 					success: function(res) {
 						wx.uploadFile({
 						wx.uploadFile({
 							url: 'https://www.zthymaoyi.com/upload/admin',
 							url: 'https://www.zthymaoyi.com/upload/admin',

+ 10 - 9
pages.json

@@ -327,9 +327,16 @@
                 "enablePullDownRefresh": false
                 "enablePullDownRefresh": false
             }
             }
             
             
-        }
+        },{
+            "path" : "pages/release/release",
+            "style" :                                                                                    
+            {
+				"navigationBarTitleText": "我的发布",
+				"enablePullDownRefresh": false
+				}
+		},
 
 
-        ,{
+        {
             "path" : "pageD/identity/driverIdentity",
             "path" : "pageD/identity/driverIdentity",
             "style" :                                                                                    
             "style" :                                                                                    
             {
             {
@@ -378,13 +385,7 @@
 		        "enablePullDownRefresh": false
 		        "enablePullDownRefresh": false
 		    }   
 		    }   
 		}
 		}
-        ,{
-            "path" : "pages/release/release",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的发布"
-				}
-		},
+        ,
 		{
 		{
             "path" : "pages/task/my_task",
             "path" : "pages/task/my_task",
             "style" :                                                                                    
             "style" :                                                                                    

+ 0 - 1
pages/user/user.vue

@@ -304,7 +304,6 @@
 				})
 				})
 			},
 			},
 			gridClick (item, index) {
 			gridClick (item, index) {
-				console.log(11111)
 				var that = this
 				var that = this
 				if(item.name == "退出登录"){
 				if(item.name == "退出登录"){
 					this.logout()
 					this.logout()