YZM 2 年之前
父節點
當前提交
74ff64b893
共有 73 個文件被更改,包括 673 次插入131 次删除
  1. 1 0
      App.vue
  2. 1 1
      env/prod.js
  3. 3 1
      manifest.json
  4. 54 0
      pages.json
  5. 1 1
      pages/index/index.vue
  6. 4 2
      pages/qianbao/index.vue
  7. 6 1
      pages/shop/index.vue
  8. 362 0
      pages/shopdetail/index.vue
  9. 6 2
      pages/user/index.vue
  10. 22 4
      pages/wardrobe/index.vue
  11. 62 2
      pages/yifu/index.vue
  12. 二進制
      static/img/100.png
  13. 二進制
      static/img/101.png
  14. 二進制
      static/img/102.png
  15. 二進制
      static/img/103.png
  16. 二進制
      static/img/91.png
  17. 二進制
      static/img/92.png
  18. 二進制
      static/img/93.png
  19. 二進制
      static/img/94.png
  20. 二進制
      static/img/95.png
  21. 二進制
      static/img/96.png
  22. 二進制
      static/img/97.png
  23. 二進制
      static/img/98.png
  24. 二進制
      static/img/99.png
  25. 13 2
      tm-vuetify/components/tm-cartCellListFood/tm-cartCellListFood.vue
  26. 4 1
      tm-vuetify/components/tm-upload/tm-upload.vue
  27. 4 0
      tm-vuetify/scss/theme/huang.css
  28. 1 0
      unpackage/debug/.roid.ins
  29. 二進制
      unpackage/debug/android_debug.apk
  30. 0 0
      unpackage/dist/build/app-plus/__uniappopenlocation.js
  31. 0 0
      unpackage/dist/build/app-plus/__uniappscan.js
  32. 0 1
      unpackage/dist/build/app-plus/app-config-service.js
  33. 0 0
      unpackage/dist/build/app-plus/app-service.js
  34. 0 0
      unpackage/dist/build/app-plus/app-view.js
  35. 0 0
      unpackage/dist/build/app-plus/manifest.json
  36. 二進制
      unpackage/dist/build/app-plus/static/img/100.png
  37. 二進制
      unpackage/dist/build/app-plus/static/img/101.png
  38. 二進制
      unpackage/dist/build/app-plus/static/img/102.png
  39. 二進制
      unpackage/dist/build/app-plus/static/img/91.png
  40. 二進制
      unpackage/dist/build/app-plus/static/img/92.png
  41. 二進制
      unpackage/dist/build/app-plus/static/img/93.png
  42. 二進制
      unpackage/dist/build/app-plus/static/img/94.png
  43. 二進制
      unpackage/dist/build/app-plus/static/img/95.png
  44. 二進制
      unpackage/dist/build/app-plus/static/img/96.png
  45. 二進制
      unpackage/dist/build/app-plus/static/img/97.png
  46. 二進制
      unpackage/dist/build/app-plus/static/img/98.png
  47. 二進制
      unpackage/dist/build/app-plus/static/img/99.png
  48. 0 0
      unpackage/dist/build/app-plus/view.css
  49. 0 0
      unpackage/dist/build/app-plus/view.umd.min.js
  50. 0 0
      unpackage/dist/dev/app-plus/__uniappopenlocation.js
  51. 0 0
      unpackage/dist/dev/app-plus/__uniappscan.js
  52. 0 1
      unpackage/dist/dev/app-plus/app-config-service.js
  53. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  54. 129 112
      unpackage/dist/dev/app-plus/app-view.js
  55. 0 0
      unpackage/dist/dev/app-plus/manifest.json
  56. 二進制
      unpackage/dist/dev/app-plus/static/img/100.png
  57. 二進制
      unpackage/dist/dev/app-plus/static/img/101.png
  58. 二進制
      unpackage/dist/dev/app-plus/static/img/102.png
  59. 二進制
      unpackage/dist/dev/app-plus/static/img/103.png
  60. 二進制
      unpackage/dist/dev/app-plus/static/img/91.png
  61. 二進制
      unpackage/dist/dev/app-plus/static/img/92.png
  62. 二進制
      unpackage/dist/dev/app-plus/static/img/93.png
  63. 二進制
      unpackage/dist/dev/app-plus/static/img/94.png
  64. 二進制
      unpackage/dist/dev/app-plus/static/img/95.png
  65. 二進制
      unpackage/dist/dev/app-plus/static/img/96.png
  66. 二進制
      unpackage/dist/dev/app-plus/static/img/97.png
  67. 二進制
      unpackage/dist/dev/app-plus/static/img/98.png
  68. 二進制
      unpackage/dist/dev/app-plus/static/img/99.png
  69. 二進制
      unpackage/dist/dev/app-plus/static/img/alexandru-acea-T5jXjei49uY-unsplash@2x.png
  70. 二進制
      unpackage/dist/dev/app-plus/static/img/组 2022@2x.png
  71. 二進制
      unpackage/dist/dev/app-plus/static/img/组 2023@2x.png
  72. 0 0
      unpackage/dist/dev/app-plus/view.css
  73. 0 0
      unpackage/dist/dev/app-plus/view.umd.min.js

+ 1 - 0
App.vue

@@ -45,4 +45,5 @@
 	/deep/ .zhuti{padding: 10px 10px;}
 	/deep/ .kuang{margin:0 !important;padding: 0px !important;}
 	.C929297{color: #929297 !important;}
+	.C0178FD{background-color:#0178FD !important;}
 </style>

+ 1 - 1
env/prod.js

@@ -1,4 +1,4 @@
 const ENV_TYPE = {
-	baseUrl: "http://localhost:9999"
+	baseUrl: "http://yigui.liliju.com"
 }
 module.exports = ENV_TYPE

+ 3 - 1
manifest.json

@@ -41,7 +41,9 @@
                 ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {}

+ 54 - 0
pages.json

@@ -217,6 +217,60 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "pages/shouyedetail/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/guanzhu/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/dingdan/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/pingjia/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/qianbao/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/shopdetail/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
 		}
 	],
 	"tabBar": { 

+ 1 - 1
pages/index/index.vue

@@ -36,7 +36,7 @@ export default {
 			list_1: [
 				{iconSize: 60,showDot:false,icon: '/static/img/31.png',noIcon:'/static/img/31.png', value: '首页' },
 				{iconSize: 60,showDot:false,icon: '/static/img/32.png',noIcon:'/static/img/32.png', value: '衣橱' },
-				{iconSize: 60,showDot:false, icon: '/static/img/33.png',noIcon:'/static/img/33.png', value: '消息' },
+				{iconSize: 60,showDot:false, icon: '/static/img/103.png',noIcon:'/static/img/103.png', value: '消息' },
 				{iconSize: 60,showDot:false, icon: '/static/img/34.png',noIcon:'/static/img/34.png', value: '商城' },
 				{iconSize: 60,showDot:false, icon: '/static/img/35.png',noIcon:'/static/img/35.png', value: '我的' }
 			],

+ 4 - 2
pages/qianbao/index.vue

@@ -5,10 +5,12 @@
 		<div class="zhuti">
 			<tm-sheet class="kuang" style="padding-bottom: 70px !important;">
 				<view style="width: 94%;margin:0 auto;">
-					
+					<view>
+						<text class="fl text-white">我的钱包</text>
+						<text class="fr">规则</text>
+					</view>
 				</view>
 			</tm-sheet>
-			<tm-button :round="24" class="sao mb-40 mt-40" block>提交</tm-button>
 		</div>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>

+ 6 - 1
pages/shop/index.vue

@@ -65,7 +65,7 @@
 		<view style="height:160px;" class="mt-40 jiage pt-40">
 			<tm-dragGrid :list="list4" :col="3" disabled="false" class="remen" :icon-size="160">
 				<template v-slot:default="{item}">
-					<view class="flex-center flex-col">
+					<view class="flex-center flex-col" @click="xiangqing">
 						<tm-icons :size="200" :name="item.icon" :color="item.color"></tm-icons>
 						<text class="text-size-m text-white pt-10">{{item.text}}</text>
 						<text class="text-size-m text-white pt-10">{{item.jie}}</text>
@@ -160,6 +160,11 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
+		xiangqing(e){
+			uni.navigateTo({
+				url: "/pages/shopdetail/index",
+			})
+		},
 		lunboFun(e){
 			this.current=e;
 		},

+ 362 - 0
pages/shopdetail/index.vue

@@ -0,0 +1,362 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="详情" :shadow="0" :showback="true"></tm-menubars>
+		<view class="C1b1b1b">
+			<tm-swiper :list="swipList" :autoplay="true" :indicator-dots="true" height="288px" circular></tm-swiper>
+			<view style="padding: 10px 20px;">
+				<view class="del_title">
+					<view>黑色手提包</view>
+					<view class="de_tag">运动休闲</view>
+				</view>
+				<view style="display: flex;justify-content: space-between;">
+					<view>
+						<text class="sale_price">¥1299.00</text>
+						<text class="original_price">原价:2088</text>
+					</view>
+					<view style="font-size: 14px;color:#ababab;">销量:42</view>
+				</view>
+			</view>
+		</view>
+		<div class="zhuti" style="padding-bottom:60px !important;">
+			<tm-sheet class="kuang" style="padding-bottom: 30px !important;">
+				<view style="width: 98%;margin:0 auto;margin-top:20px !important;position: relative;">
+					<view style="padding: 10px 10px 0px;">
+						<view class="line_bottom" style="font-size: 15px;">商品参数:</view>
+						<view class="line_bottom">
+							<view class="" v-for="(item,index) in showList" :key="index">
+								<view class="line_my text-white" >
+									<view style="width: 100px;">{{item}}:</view>
+									<view >
+										{{index==0?paramList.name:''}}
+										{{index==1?paramList.style:''}}
+										{{index==2?paramList.goodNo:''}}
+										{{index==3?paramList.size:''}}
+										{{index==4?paramList.artNo:''}}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="" style="padding: 10px 0px 0px;">
+						<text v-html="explain"></text>
+					</view>
+				</view>
+			</tm-sheet>
+			<view class="" style="text-align: center;margin: 20px 0;font-size: 15px;">
+				- 猜你喜欢 -
+			</view>
+			<view style="width: 94%;margin:0 auto;" class="remen">
+				<view v-for="(item,index) in listdata" class="round-5 contone  mt-20" :class="index%2==0?'fl':'fr'"
+					@click="goDetail(item.id)" style="background-color: #1B1B1B;">
+					<image class="logo" :src="item.image" mode="widthFix"></image>
+					<view class="pa-15 text-size-s">
+						<view class="fr biaoqian">运动休闲</view>
+						<view class="">
+							<text class="text-size-lg">{{item.text}}</text>
+							<view class="text-gray mt-6">销量:{{item.xiaol}}</view>
+							
+						</view>
+						<view class="mt-2 flex-between flex-center">
+							<view class="touxiang mt-30">
+								<text class="text-white text-size-m text-weight-b">{{item.jiage}}</text>
+							</view>
+							<view>
+								<image @click="jiarufuFun(item)" class="remenzan" src="/static/img/86.png"
+									mode="widthFix"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style="clear: both;"></view>
+				<view style="clear: both;" class="more ma-40 pt-40" @click="gengmore()">
+					<image src="/static/img/30.png" mode="widthFix"></image>
+					<text class="text-size-s">下拉加载更多~</text>
+				</view>
+			</view>
+		</div>
+		<view class="bottom_btn">
+			<view class="btn_col" style="background: #1c1c1c;" @click="goCollect">
+				<image style="width: 18px;height: 16px;" src="/static/img/98.png" mode="widthFix"></image>
+				<text style="margin-left: 10px;">收藏</text>
+			</view>
+			<view class="btn_gouwu" style="background:#303030;" @click="goBar">
+				<image src="/static/img/97.png" mode="widthFix" style="width: 15px;height: 16px;"></image>
+				<text style="margin-left: 10px;">添加购物车</text>
+			</view>
+			<view class="btn_buy" style="background: #0178fd;" @click="goBuy">立即购买</view>
+		</view>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
+	</view>
+</template>
+<script>
+	import {
+		myRequest
+	} from '@/api/request.js'
+	export default {
+		data() {
+			return {
+				showList: ['名称', '款式', '商品编号', '尺寸', '货号'],
+				xianshi: true,
+				swipList: [{
+						src: '../../static/img/99.png'
+					}, {
+						src: '../../static/img/99.png'
+					},
+					{
+						src: '../../static/img/99.png'
+					}
+				],
+				// 参数列表
+				paramList: {
+					name: '黑色公文包',
+					style: '黑色 QD2334664 L',
+					goodNo: '19862088811',
+					size: 'S/M/L',
+					artNo: 'QD2334664'
+				},
+				// 说明
+				explain: "<ul style='font-size: 14px;text-indent: 0.5em;'><li style='margin-bottom: 10px;'>划线价格,商品的专柜价、吊牌价、正品零售价、厂商指导价或该商品的曾经展示过的销售价等,并非原价,仅供参考。</li><li> 未划线价格,商品的实时标价,不因表述的差异改变性质。具体成交价格根据商品参加活动,或会员使用优惠券、积分等发生变化,最终以订单结算页价格为准。</li></ul>",
+				listdata: []
+			};
+		},
+		onLoad() {},
+		created() {
+			this.sys = uni.getSystemInfoSync();
+			this.randouh()
+		},
+		methods: {
+			jiarufuFun(){
+				
+			},
+			goDetail(){
+				
+			},
+			randouh() {
+				let list2 = [],
+					that = this;
+				for (let i = 0; i < 8; i++) {
+					list2.push({
+						image: '../../static/img/90.png',
+						text: '帽子',
+						jiage: '¥ 359.00',
+						xiaol: '128'
+					})
+				}
+				this.listdata = this.listdata.concat(list2)
+				console.log(this.listdata)
+			},
+			xiugaiFun() {
+				this.xianshi = false;
+			},
+			gengmore() {
+				this.randouh()
+			},
+			goCollect() {
+				console.log('收藏');
+			},
+			goBar() {
+				console.log('购物车');
+			},
+			goBuy() {
+				console.log('购买');
+			}
+
+		},
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body {
+		background-color: #1b1b1b !important;
+	}
+
+	.del_title {
+		display: flex;
+		justify-content: space-between;
+		margin: 0 0 15px;
+		font-size: 16px;
+	}
+
+	.sale_price {
+		color: #0E68CF;
+		margin-right: 12px;
+		font-weight: bold;
+		font-size: 17px;
+	}
+
+	.de_tag {
+		border-radius: 20px;
+		background: rgba(156, 156, 156, 0.3);
+		padding: 5px 14px;
+		font-size: 13px;
+	}
+
+	.original_price {
+		text-decoration: line-through;
+		color: #ababab;
+		font-size: 13px;
+	}
+
+	/deep/ .zhuti {
+		padding: 0px 5px 10px;
+	}
+
+	/deep/ .kuang {
+		margin: 0 !important;
+		padding: 0px !important;
+	}
+
+	/deep/ .round-4 {
+		border-radius: 0px !important;
+	}
+
+	.kuang .line_bottom {
+		padding: 10px;
+		border-bottom: 2px solid rgba(129, 129, 129, 0.2);
+	}
+
+	.line_my {
+		margin: 10px 0;
+		display: flex;
+		font-size: 14px;
+	}
+
+	/deep/ .qiehuan1 .text-primary {
+		color: white !important;
+	}
+
+	.touxiang {
+		width: 100%;
+		display: block;
+		margin-top: 10px;
+	}
+
+	.xiugai image {
+		width: 18px;
+		vertical-align: middle;
+		margin-right: 5px;
+	}
+
+	.xiugai text {
+		vertical-align: middle;
+	}
+
+	.xiugai {
+		position: absolute;
+		right: 5px;
+		top: 10px;
+	}
+
+	.you {
+		border-radius: 10px;
+		padding: 10px;
+		width: 88%;
+		margin: 0 auto;
+		margin-top: 20px;
+	}
+
+	/deep/ .you .grey-darken-5 {
+		background-color: #0d0d0d !important;
+		padding: 0px !important;
+	}
+
+	/deep/ .you .text-red {
+		color: white;
+	}
+
+	/deep/ .tan .active {
+		background-color: #AAAAAA !important;
+	}
+
+	/deep/ .tan .tm-poups .grey-darken-5 {
+		background-color: gray !important;
+	}
+
+	/deep/ .tan uni-input {
+		text-align: right;
+	}
+
+	/deep/ .you .border-grey-darken-4-b-1 {
+		border-bottom: solid 1px #313131 !important;
+	}
+
+	.yiguicla image {
+		width: 95%;
+		display: block;
+		margin: 0 auto;
+		margin-top: 5px;
+	}
+
+	.yiguicla {
+		width: 30%;
+		border-radius: 10px;
+	}
+
+	.sao {
+		width: 88%;
+		margin: 0 auto;
+		margin-top: 40px;
+	}
+
+	/deep/ .mx-32 {
+		margin: 0px !important;
+		margin-top: 15px !important;
+	}
+
+	.bottom_btn {
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 50px;
+		display: flex;
+		position: fixed;
+		font-size: 15px;
+		justify-content: space-between;
+		box-sizing: border-box;
+
+		.btn_col,
+		.btn_gouwu,
+		.btn_buy {
+			height: 100%;
+			width: 33.3%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+		}
+	}
+
+	.logo {
+		width: 100%;
+	}
+
+	.dingwei {
+		width: 21%;
+		margin-top: 3%;
+	}
+
+	.contone {
+		width: 48%;
+	}
+
+	.remenzan {
+		width: 18px !important;
+		margin-top: 10px;
+	}
+
+	.more {
+		text-align: center;
+	}
+
+	.more image {
+		margin-right: 10px;
+		vertical-align: middle;
+		width: 30px;
+	}
+	.biaoqian{
+		background: #303440;
+		padding: 4px 15px;
+		border-radius: 30px;
+	}
+</style>

+ 6 - 2
pages/user/index.vue

@@ -85,9 +85,9 @@ export default {
 	},
 	methods: {
 		tiaozhuan(type){
-			if(type==8){
+			if(type==1){
 				uni.navigateTo({
-					url: "/pages/chuanghome/index",
+					url: "/pages/qianbao/index",
 				})
 			}else if(type==2){
 				uni.navigateTo({
@@ -105,6 +105,10 @@ export default {
 				uni.navigateTo({
 					url: "/pages/guanzhu/index",
 				})
+			}else if(type==8){
+				uni.navigateTo({
+					url: "/pages/chuanghome/index",
+				})
 			}else if(type==10){
 				uni.navigateTo({
 					url: "/pages/luru/index",

+ 22 - 4
pages/wardrobe/index.vue

@@ -58,7 +58,7 @@
 			<!-- 衣橱 -->
 			<tm-sheet class="yichu" style="margin-bottom: 70px !important;">
 				<tm-tabs class="C1b1b1b qiehuan" @change="fenleichange" color="white"  align="left"  v-model="activeIndex" :list="list" range-key="title"></tm-tabs>
-				<view class="yiguicla black pa-6 ma-4 fl" v-for="item in quanbuList" @click="yifu()">
+				<view class="yiguicla black pa-6 ma-4 fl" :class="index==chooseindex?'C0178FD':''" v-for="(item,index) in quanbuList" @click="yifu(index)">
 					<image :src="item.src" mode="widthFix"></image>
 					<view class="text-align-center text-size-m mt-8">{{item.text}}</view>
 					<view class="text-align-center text-size-m mt-6 mb-6">{{item.type}}</view>
@@ -69,6 +69,14 @@
 				</view>
 			</tm-sheet>
 		</view>
+		<!-- 待取衣服 -->
+		<tm-translate ref="a_1" :auto="true" animation-name="fadeLeft">
+			<view class="fudong" @click="chuku">
+				<image src="/static/img/96.png" class="fudimg fl"></image>
+				<view class="pt-20">待取衣物</view>
+				<view>(<text style="color: #FFCC00;">3</text>件)</view>
+			</view>
+		</tm-translate>
 	</view>
 </template>	
 <script>
@@ -105,7 +113,8 @@ export default {
 				src:'/static/img/47.png',
 				text:'大号版型夹克',
 				type:'新品'
-			}]
+			}],
+			chooseindex:-1
 		};
 	},
 	onLoad() {
@@ -122,10 +131,15 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 		
 		console.log("222")
-		this.getfenltext()
+		// this.getfenltext()
 		this.fenleichange();
 	},
 	methods: {
+		chuku(){
+			uni.navigateTo({
+				url: "/pages/quchu/index",
+			})
+		},
 		sosoFun(){
 			uni.navigateTo({
 				url: "/pages/shopsoso/index",
@@ -181,7 +195,8 @@ export default {
 				}
 			})
 		},
-		yifu(){
+		yifu(index){
+			this.chooseindex=index;
 			uni.navigateTo({
 				url: "/pages/yifu/index",
 			})
@@ -286,4 +301,7 @@ export default {
 	.yiguicla{width: 30%;border-radius: 10px;}
 	.more{text-align: center;}
 	.more image{margin-right: 10px;vertical-align: middle;width: 30px;}
+	.fudong{position:fixed;right:10px;bottom:150px;background: #303030;width: 130px;height: 60px;
+	border-radius: 30px 0px 0px 30px;font-size: 14px;text-align: center;}
+	.fudimg{width: 60px;height:60px}
 </style>

+ 62 - 2
pages/yifu/index.vue

@@ -54,8 +54,27 @@
 					></tm-listitem>
 				</view>
 			</tm-sheet>
-			<tm-button :round="24" class="sao mb-40" block @click="chuFun">出库</tm-button>
+			<tm-button :round="24" class="sao mb-40" block @click="show_1=true">出库</tm-button>
 		</div>
+		
+		<tm-poup v-model="show_1" :position="pos" class="tcc">
+			<view style="position: relative !important;">
+				<view style="height: 10px;"></view>
+				<tm-swiper :current="1" :indicator-dots="false" :round="6" :ani3d="190"  :autoplay="false" :list="list1"></tm-swiper>
+				<view class="text-white text-align-center mt-15">丝缎质感纹理风衣</view>
+				<view class="text-white text-align-center mt-10 text-size-s">黑色 - 6518/320</view>
+				<image class="guayi" src="/static/img/102.png" mode="widthFix"></image>
+				<view class="text-white text-align-center mt-15">衣物位于 挂衣区 5号衣柜</view>
+				<view class="text-white text-align-center mt-15">
+					<image class="aniOn deng" src="/static/img/101.png" mode="widthFix"></image>
+					<text style="vertical-align: middle;">指示灯已亮,请取出衣柜</text>
+				</view>
+				<view class="anniu">
+					<tm-button @click="quxiao()" theme="gray" size="n">取消</tm-button>
+					<tm-button @click="chuFun()" class="fr" theme="primary" size="n">确认</tm-button>
+				</view>
+			</view>
+		</tm-poup>
 		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
 	</view>
@@ -65,7 +84,14 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
+			show_1:false,
+			pos:'center',
 			xianshi:true,
+			list1:[		
+				'../../static/img/100.png',
+				'../../static/img/100.png',
+				'../../static/img/100.png',
+			],
 			list:[ '商品介绍','搭配方案'],
 			activeIndex:0,
 			reqData:{
@@ -98,9 +124,12 @@ export default {
 		xiugaiFun(){
 			this.xianshi=false;
 		},
+		quxiao(){
+			this.show_1=false;
+		},
 		chuFun(){
 			uni.navigateTo({
-				url: "/pages/quchu/index",
+				url: "/pages/index/index?index=1",
 			})
 		}
 	},
@@ -134,4 +163,35 @@ export default {
 	.yiguicla{width: 30%;border-radius: 10px;}
 	.sao{width: 88%;margin:0 auto;margin-top:40px;}
 	/deep/ .mx-32{margin:0px !important;margin-top:15px !important;}
+	/deep/ .tcc .tm-poup-wk{width: 90% !important;position:relative;height: 580px !important;}
+	/deep/ .tcc .uni-swiper-slides{width: 100%;}
+	/deep/ .tcc uni-swiper{width: 100% !important;}
+	/deep/ .uni-swiper-slides{width: 160px !important;}
+	/deep/ .tcc uni-image{width: 160px !important;}
+	.tcc .guayi{width: 90% !important;display: block;margin:0 auto;margin-top:15px !important;}
+	.tcc .deng{width:25px !important;height:25px !important;vertical-align: middle;margin-right:8px;}
+	.aniOn{
+		animation:doudong 0.5s linear infinite;
+		background:linear-gradient();
+		background: -webkit-linear-gradient();
+	}
+	@keyframes doudong {
+		0%{
+			transform: rotate(-2deg) translateX(2rpx) translateY(2rpx);
+		}
+		25%{
+			transform: rotate(0deg) translateX(-2rpx) translateY(-2rpx);
+		}
+		50%{
+			transform: rotate(0deg) translateX(0rpx) translateY(-2rpx);
+		}
+		75%{
+			transform: rotate(0deg) translateX(0rpx) translateY(2rpx);
+		}
+		100%{
+			transform: rotate(-2deg) translateX(2rpx) translateY(2rpx);
+		}
+	}
+	.anniu{width: 80%;margin: 0 auto;margin-top: 20px;}
+	/deep/ .anniu .gray.bk{color: white !important;}
 </style>

二進制
static/img/100.png


二進制
static/img/101.png


二進制
static/img/102.png


二進制
static/img/103.png


二進制
static/img/91.png


二進制
static/img/92.png


二進制
static/img/93.png


二進制
static/img/94.png


二進制
static/img/95.png


二進制
static/img/96.png


二進制
static/img/97.png


二進制
static/img/98.png


二進制
static/img/99.png


+ 13 - 2
tm-vuetify/components/tm-cartCellListFood/tm-cartCellListFood.vue

@@ -16,6 +16,7 @@
 			<view class="pl-15">
 				<view class="title  text-size-s text-weight-b text-overflow-2" style="line-height: 32rpx;"  :class="[black_tmeme ? 'bk' : '',]">
 					{{mdata[keyMap['title']]}}
+					<image v-if="typeclick==4" class="shanchu" src="/static/img/94.png"></image>
 				</view>
 				<view  style="min-height: 64rpx;" >
 					<view v-if="!dense&&mdata[keyMap['label']]" class="tm-cartCellListFood-label text-size-s text-grey py-8">{{mdata[keyMap['label']]}}</view>
@@ -28,11 +29,10 @@
 				</view>
 				<view class="tm-cartCellListFood-price flex-between">
 					<view>
-						<text class="text-size-xs text-red">¥</text>
+						<text class="text-size-xs text-red" v-if="typeclick!=3">¥</text>
 						<text class="text-size-n text-red text-weight-b px-5">{{mdata[keyMap['price']]}}</text>
 						<text v-if="mdata[keyMap['unit']]" class="text-size-xs text-grey pr-10">/{{mdata[keyMap['unit']]}}</text>
 						<text v-if="mdata[keyMap['salePrice']]" class="text-delete text-size-xxs text-grey">¥{{mdata[keyMap['salePrice']]}}</text>
-						
 					</view>
 					<view class="flex jiarugouwuche" v-if="typeclick==1" @click="jiaru(mdata)">
 						<image class="" src="/static/img/86.png"></image>
@@ -54,6 +54,13 @@
 							<text class="iconfont icon-plus text-size-xs"></text>
 						</view>
 					</view>
+					<view class="flex" v-if="typeclick==3" @click="jiaru(mdata)">
+						<view class="qiangwang">前往商城购买</view>
+					</view>
+					<view class="flex" v-if="typeclick==4">
+						<view class="fukuan mr-10">去付款</view>
+						<view class="fukuan">去付款</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -220,4 +227,8 @@
 
 <style lang="less">
 	.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;}
+	.shanchu{width: 25px;height:25px;float: right;}
 </style>

+ 4 - 1
tm-vuetify/components/tm-upload/tm-upload.vue

@@ -9,7 +9,7 @@
 					<tm-icons @click="del(index)" :black="black_tmeme" name="icon-times-circle-fill" size="36" color="red"></tm-icons>
 				</slot>
 			</view>
-			<view @click.stop="$tm.preview.previewImg(item.url,list,'url')" class="tm-upload-item-ck text flex-center  overflow" 
+			<view @click.stop="zhanshistop(item.url,list,'url')" class="tm-upload-item-ck text flex-center  overflow" 
 			:class="[color_tmeme,black_tmeme?'grey-darken-4 bk':'',`round-${round}`]">
 				<slot name="img" :info={itemWidth,itemHeight}>
 					<tm-icons style="line-height: 0;" name="icon-exclamationcircle-f" v-if="item['loaderror']==true"></tm-icons>
@@ -269,6 +269,9 @@
 
 		},
 		methods: {
+			zhanshistop(url,list,stringurl){
+				// this.$tm.preview.previewImg(url,list,stringurl)
+			},
 			errorFile(item,index){
 				let id = item;
 				id['loaderror'] = true;

File diff suppressed because it is too large
+ 4 - 0
tm-vuetify/scss/theme/huang.css


+ 1 - 0
unpackage/debug/.roid.ins

@@ -0,0 +1 @@
+forceInstall

二進制
unpackage/debug/android_debug.apk


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


二進制
unpackage/dist/build/app-plus/static/img/100.png


二進制
unpackage/dist/build/app-plus/static/img/101.png


二進制
unpackage/dist/build/app-plus/static/img/102.png


二進制
unpackage/dist/build/app-plus/static/img/91.png


二進制
unpackage/dist/build/app-plus/static/img/92.png


二進制
unpackage/dist/build/app-plus/static/img/93.png


二進制
unpackage/dist/build/app-plus/static/img/94.png


二進制
unpackage/dist/build/app-plus/static/img/95.png


二進制
unpackage/dist/build/app-plus/static/img/96.png


二進制
unpackage/dist/build/app-plus/static/img/97.png


二進制
unpackage/dist/build/app-plus/static/img/98.png


二進制
unpackage/dist/build/app-plus/static/img/99.png


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/view.css


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/view.umd.min.js


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


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


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
+ 129 - 112
unpackage/dist/dev/app-plus/app-view.js


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


二進制
unpackage/dist/dev/app-plus/static/img/100.png


二進制
unpackage/dist/dev/app-plus/static/img/101.png


二進制
unpackage/dist/dev/app-plus/static/img/102.png


二進制
unpackage/dist/dev/app-plus/static/img/103.png


二進制
unpackage/dist/dev/app-plus/static/img/91.png


二進制
unpackage/dist/dev/app-plus/static/img/92.png


二進制
unpackage/dist/dev/app-plus/static/img/93.png


二進制
unpackage/dist/dev/app-plus/static/img/94.png


二進制
unpackage/dist/dev/app-plus/static/img/95.png


二進制
unpackage/dist/dev/app-plus/static/img/96.png


二進制
unpackage/dist/dev/app-plus/static/img/97.png


二進制
unpackage/dist/dev/app-plus/static/img/98.png


二進制
unpackage/dist/dev/app-plus/static/img/99.png


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


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


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


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


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


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