YZM 2 years ago
parent
commit
3452d15dbc

+ 45 - 0
pages.json

@@ -271,6 +271,51 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "pages/zidingyi/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/changan/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/dapeizidingyi/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/dizhi/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/shouhuodi/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
 		}
 	],
 	"tabBar": { 

+ 1 - 15
pages/dizhi/index.vue

@@ -61,21 +61,7 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
-		aa(num){
-			if(num==1){
-				this.checked1=true;
-				this.checked2=false;
-				this.checked3=false;
-			}else if(num==2){
-				this.checked1=false;
-				this.checked2=true;
-				this.checked3=false;
-			}else if(num==3){
-				this.checked1=false;
-				this.checked2=false;
-				this.checked3=true;
-			}
-		},
+		
 	},
 }
 </script>

BIN
static/img/104.png


BIN
static/img/105.png


BIN
static/img/106.png


BIN
static/img/107.png


BIN
static/img/108.png


BIN
static/img/109.png


+ 11 - 1
tm-vuetify/components/tm-cartCellListFood/tm-cartCellListFood.vue

@@ -61,6 +61,14 @@
 						<view class="fukuan mr-10">去付款</view>
 						<view class="fukuan">去付款</view>
 					</view>
+					<view style="position: absolute;right: 20px;" v-if="typeclick==5">
+						<view class="genghuan mr-10">更换</view>
+						<!-- <view class="genghuan">取出</view> -->
+					</view>
+					<view style="position: absolute;right: 20px;" v-if="typeclick==6">
+						<view class="genghuan mr-10">更换</view>
+						<view class="genghuan">取出</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -229,6 +237,8 @@
 	.jiarugouwuche image{width: 28px !important;height:28px !important;}
 	.qiangwang{width: 100px;height: 28px;background: #303440;border: 1px solid white;font-size: 13px;
 	text-align: center;color: white;line-height: 28px;border-radius: 5px;margin-top: 30px;}
-	.fukuan{color:white;font-size: 15px;background: #303440;padding:4px 15px 4px 15px;border-radius: 40px;}
+	.fukuan{color:white;font-size: 14px;background: #303440;padding:4px 15px 4px 15px;border-radius: 40px;}
 	.shanchu{width: 25px;height:25px;float: right;}
+	.genghuan{color:#EBEBEB;font-size: 14px;background: #303440;border-radius: 6px;width: 60px;height: 27px;
+	border:1px solid #EBEBEB;text-align: center;line-height: 27px;margin-top: 8px;}
 </style>

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 294 - 16
unpackage/dist/dev/app-plus/app-view.js


BIN
unpackage/dist/dev/app-plus/static/img/104.png


BIN
unpackage/dist/dev/app-plus/static/img/105.png


BIN
unpackage/dist/dev/app-plus/static/img/106.png


BIN
unpackage/dist/dev/app-plus/static/img/107.png


BIN
unpackage/dist/dev/app-plus/static/img/108.png


BIN
unpackage/dist/dev/app-plus/static/img/109.png


BIN
unpackage/dist/dev/app-plus/static/img/alexandru-acea-T5jXjei49uY-unsplash@2x.png


BIN
unpackage/dist/dev/app-plus/static/img/组 2022@2x.png


BIN
unpackage/dist/dev/app-plus/static/img/组 2023@2x.png


Some files were not shown because too many files changed in this diff