更新md 购物车跳转 购物车页面不要修改 不要修改

README.md

@@ -29,4 +29,20 @@ http://apidoc.chelvc.com/maintain/
 wangzhongqing 564342
 
 http://gogs.chelvc.com/  git
-https://js.design/ti?c=fMpU7uE9B48CA8a/ // ui图
+https://js.design/ti?c=fMpU7uE9B48CA8a/ // ui图
+
+{
+	id:xxx, // 商家id
+	goodsid:[xxx,xxx] // 商品id
+	
+}
+
+{
+	id:xxx, // 商家id
+	goodsid:[xxx,xxx] // 商品id
+	
+}
+
+购物车修改 
+二维码添加
+优惠卷跳转

package-lock.json

@@ -5925,6 +5925,7 @@
     "node_modules/anymatch": {
       "version": "3.1.3",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "devOptional": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -6419,6 +6420,7 @@
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "devOptional": true,
       "engines": {
         "node": ">=8"
       }
@@ -6556,6 +6558,7 @@
     "node_modules/braces": {
       "version": "3.0.2",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "devOptional": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -6914,6 +6917,7 @@
     "node_modules/chokidar": {
       "version": "3.5.3",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "devOptional": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -6934,6 +6938,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "devOptional": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -9497,6 +9502,7 @@
     "node_modules/fill-range": {
       "version": "7.0.1",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "devOptional": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -9850,6 +9856,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -10776,6 +10783,7 @@
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "devOptional": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -10862,6 +10870,7 @@
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10905,6 +10914,7 @@
     "node_modules/is-glob": {
       "version": "4.0.3",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "devOptional": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -10936,6 +10946,7 @@
     "node_modules/is-number": {
       "version": "7.0.0",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "devOptional": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -14315,6 +14326,7 @@
     "node_modules/picomatch": {
       "version": "2.3.1",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "devOptional": true,
       "engines": {
         "node": ">=8.6"
       }
@@ -15235,6 +15247,7 @@
     "node_modules/prettier": {
       "version": "2.8.4",
       "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
+      "devOptional": true,
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -15695,6 +15708,7 @@
     "node_modules/readdirp": {
       "version": "3.6.0",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "devOptional": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -17916,6 +17930,7 @@
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "devOptional": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -24063,6 +24078,7 @@
     "anymatch": {
       "version": "3.1.3",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "devOptional": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -24454,7 +24470,8 @@
     },
     "binary-extensions": {
       "version": "2.2.0",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "devOptional": true
     },
     "bindings": {
       "version": "1.5.0",
@@ -24580,6 +24597,7 @@
     "braces": {
       "version": "3.0.2",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "devOptional": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
@@ -24899,6 +24917,7 @@
     "chokidar": {
       "version": "3.5.3",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "devOptional": true,
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -24914,6 +24933,7 @@
           "version": "5.1.2",
           "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
           "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "devOptional": true,
           "requires": {
             "is-glob": "^4.0.1"
           }
@@ -26991,6 +27011,7 @@
     "fill-range": {
       "version": "7.0.1",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "devOptional": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -27269,6 +27290,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -28007,6 +28029,7 @@
     "is-binary-path": {
       "version": "2.1.0",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "devOptional": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -28067,7 +28090,8 @@
     },
     "is-extglob": {
       "version": "2.1.1",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "devOptional": true
     },
     "is-file-esm": {
       "version": "1.0.0",
@@ -28099,6 +28123,7 @@
     "is-glob": {
       "version": "4.0.3",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "devOptional": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -28120,7 +28145,8 @@
     },
     "is-number": {
       "version": "7.0.0",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "devOptional": true
     },
     "is-path-inside": {
       "version": "3.0.3",
@@ -30903,7 +30929,8 @@
     },
     "picomatch": {
       "version": "2.3.1",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "devOptional": true
     },
     "pify": {
       "version": "2.3.0",
@@ -31601,7 +31628,8 @@
     },
     "prettier": {
       "version": "2.8.4",
-      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
+      "devOptional": true
     },
     "pretty-error": {
       "version": "4.0.0",
@@ -31991,6 +32019,7 @@
     "readdirp": {
       "version": "3.6.0",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "devOptional": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
@@ -33785,6 +33814,7 @@
     "to-regex-range": {
       "version": "5.0.1",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "devOptional": true,
       "requires": {
         "is-number": "^7.0.0"
       }

src/pages/client/clientPackage/uptickOrder.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="order-cantina">
-		<!-- 商品信息 -->
+		<!-- 商品信息1 -->
 		<view class="shop-info public">
 			<view class="title margin-bot flex">
 				<text class="title-font"> {{ order_list.name }} </text>

src/pages/client/clientUser/cart/index.vue

@@ -4,7 +4,7 @@
       <view @click="handlerManage">管理</view>
       <!-- <view>退出管理</view> -->
     </view>
-    <!-- 列表 -->
+    <!-- 列表1 -->
     <!-- <CartList :init_list.sync='init_list' :isAllSecect.sync='isAllSecect' @handlerIsSelectAll='handlerIsSelectAll'></CartList> -->
     <view class="item-box">
       <u-checkbox-group shape='circle' placement="column" v-model="goodsCheckbox">
@@ -134,6 +134,11 @@
 
           generateConfirmOrder({cartIds:this.goodsCheckbox,payType:2}).then(res=>{
             console.log('@@@@res',res)
+			if(res.code == 200){
+				uni.navigateTo({
+					url:'/pages/client/clientPackage/uptickOrder'
+				})
+			}
           })
         }
       },