修改

pagesMy/order/index.vue

@@ -248,7 +248,7 @@
 								order_id: item._id,
 								user: item.user,
 								user_name: item.user_name,
-								good: item.goods,
+								good: item.good,
 								good_name: item.good_name,
 								good_file: [item.good_file],
 								spec: item.spec,
@@ -262,7 +262,7 @@
 							const res = await that.$api(`/Upkeep`, 'POST', obj);
 							if (res.errcode == '0') {
 								uni.showToast({
-									title: '维护信息成功',
+									title: '申请维修成功',
 									icon: 'none'
 								})
 								that.clearPage()

pagesMy/record/index.vue

@@ -246,7 +246,8 @@
 				let res;
 				// 查询状态
 				res = await that.$api(`/DictData`, 'GET', {
-					type: 'order_status'
+					type: 'order_status',
+					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
 				// 查询角色

pagesMy/repair/detail.vue

@@ -19,18 +19,11 @@
 				</view>
 				<view class="right">
 					<view class="name textOver">
-						<text>{{info.zhType||'暂无'}}</text>
 						<text>{{info.good_name||'暂无'}}</text>
 					</view>
 					<view class="spec textOver">
 						<text>规格：{{info.spec_name||'暂无'}}</text>
 					</view>
-					<view class="num">
-						<text>数量：{{info.num||'暂无'}}</text>
-					</view>
-					<view class="money">
-						<text>￥{{info.money||'暂无'}}</text>
-					</view>
 				</view>
 			</view>
 		</view>
@@ -46,11 +39,11 @@
 		</view>
 		<view class="thr">
 			<view class="thr_1">
-				<text>下单人员：</text>
+				<text>申请人员：</text>
 				<text>{{info.user_name||'暂无'}}</text>
 			</view>
 			<view class="thr_1">
-				<text>下单人员电话：</text>
+				<text>申请人员电话：</text>
 				<text>{{info.user_tel||'暂无'}}</text>
 			</view>
 			<view class="thr_1">
@@ -100,6 +93,8 @@
 				if (that.id) {
 					const res = await that.$api(`/Upkeep/${that.id}`, 'GET', {})
 					if (res.errcode == '0') {
+						const arr = await that.$api(`/User/${res.data.user}`, 'GET', {})
+						if (arr.errcode === 0) res.data.user_tel = arr.data.tel
 						res.data.zhStatus = that.searchDict(res.data.status, 'status')
 						that.$set(that, `info`, res.data)
 					} else {
@@ -184,14 +179,6 @@
 					.name {
 						padding: 1vw 0 0 0;
 						font-size: var(--font14Size);
-
-						text:first-child {
-							font-size: var(--font12Size);
-							color: var(--mainColor);
-							background-color: var(--f3CColor);
-							border-radius: 5px;
-							padding: 2px 5px;
-						}
 					}
 
 					.spec {

pagesMy/repair/index.vue

@@ -16,10 +16,11 @@
 						</view>
 						<view class="list_2">
 							<view class="left">
-								<image v-if="item.spec_file" class="image" :src="item.spec_file?item.spec_file.url:''"
-									mode="">
+								<image v-if="item.spec_file" class="image"
+									:src="item.spec_file&&item.spec_file.length>0?item.spec_file[0].url:''" mode="">
 								</image>
-								<image v-else class="image" :src="item.good_file?item.good_file.url:''" mode="">
+								<image v-else class="image"
+									:src="item.good_file&&item.good_file.length>0?item.good_file[0].url:''" mode="">
 								</image>
 							</view>
 							<view class="right">
@@ -27,24 +28,12 @@
 									<view class="name textOver">
 										<text>{{item.good_name||'暂无'}}</text>
 									</view>
-									<view class="num">
-										<text>￥{{item.total_money||'0'}}</text>
-										<text>×{{item.num||'0'}}</text>
-									</view>
 								</view>
 								<view class="right_2">
 									<view class="spec textOver">
 										<text>规格：</text>
 										<text>{{item.spec_name||'暂无'}}</text>
 									</view>
-									<view class="spec textOver">
-										<text>购买用户：</text>
-										<text>{{item.user_name||'暂无'}}</text>
-									</view>
-									<view class="spec textOver">
-										<text>用户角色：</text>
-										<text>{{item.zhRole||'暂无'}}</text>
-									</view>
 									<view class="spec textOver">
 										<text>申请时间：</text>
 										<text>{{item.apply_time||'暂无'}}</text>
@@ -166,6 +155,37 @@
 					url: `/pagesMy/repair/detail?id=${e.id||e._id}`
 				})
 			},
+			// 申请维修
+			toKeep(item) {
+				const that = this;
+				let user = that.user;
+				let obj = {
+					status: '2',
+					order_id: item.order_id
+				}
+				uni.showModal({
+					title: '提示',
+					content: '确定该商品维修成功吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/Upkeep/${item._id}`, 'POST', obj);
+							if (res.errcode == '0') {
+								uni.showToast({
+									title: '维护信息成功',
+									icon: 'none'
+								})
+								that.clearPage()
+								that.search()
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
 			// 查询字典表
 			searchDict(e, model) {
 				const that = this;

unpackage/dist/dev/mp-weixin/components/tabs/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/tabs/index.wxss

@@ -0,0 +1,23 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.tabs .one {
+  padding: 2vw;
+}
+.tabs .one .scrollView {
+  display: flex;
+  white-space: nowrap;
+  text-align: center;
+}
+.tabs .one .list {
+  display: inline-block;
+  padding: 2vw;
+  margin: 0 1.5vw;
+  text-align: center;
+  border-radius: 5px;
+}
+.tabs .one .list text {
+  font-weight: bold;
+  font-size: 14px;
+}
+

unpackage/dist/dev/mp-weixin/components/upload/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/upload/index.wxss

@@ -0,0 +1,38 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.upload {
+  padding: 0 2vw;
+}
+.upload .upload_1 {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
+.upload .upload_1 .list {
+  position: relative;
+  width: 30vw;
+  height: 28vw;
+  text-align: center;
+  margin: 0 3vw 2vw 0;
+  border-radius: 5px;
+  box-shadow: 0 0 2px var(--f85Color);
+}
+.upload .upload_1 .list .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+.upload .upload_1 .list .add {
+  position: relative;
+  top: 20px;
+}
+.upload .upload_1 .list .del {
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+.upload .upload_1 .list:nth-child(3n) {
+  margin: 0 0 2vw 0;
+}
+

unpackage/dist/dev/mp-weixin/pages/good/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "所有商品",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/good/index.wxss

@@ -0,0 +1,96 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content .one {
+  height: 100vh;
+  display: flex;
+  flex-direction: row;
+}
+.content .one .one_1 {
+  position: relative;
+  width: 25vw;
+  background-color: #fafafa;
+  display: flex;
+  flex-direction: column;
+}
+.content .one .one_1 .list {
+  text-align: center;
+  padding: 2.5vw 0;
+  border-bottom: 1px solid var(--f1Color);
+}
+.content .one .one_1 .list text {
+  font-size: var(--font14Size);
+}
+.content .one .one_1 .listActive {
+  background-color: var(--fffColor);
+}
+.content .one .one_2 {
+  flex-grow: 1;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+}
+.content .one .one_2 .one_2_1 {
+  padding: 0 2vw;
+  width: 70vw;
+}
+.content .one .one_2 .one_2_1 .list {
+  display: flex;
+  width: 66vw;
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  box-shadow: 0 0 5px var(--f1Color);
+  border-radius: 5px;
+}
+.content .one .one_2 .one_2_1 .list .img {
+  width: 20vw;
+}
+.content .one .one_2 .one_2_1 .list .img .image {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 5px;
+}
+.content .one .one_2 .one_2_1 .list .info {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  width: 45vw;
+  padding: 0 0 0 2vw;
+}
+.content .one .one_2 .one_2_1 .list .info .name {
+  font-size: var(--font15Size);
+}
+.content .one .one_2 .one_2_1 .list .info .num {
+  display: flex;
+  justify-content: space-between;
+}
+.content .one .one_2 .one_2_1 .list .info .num .left {
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
+}
+.content .one .one_2 .one_2_1 .list .info .num .right {
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pages/home/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "首页",
+  "enablePullDownRefresh": true,
+  "usingComponents": {
+    "uni-grid": "/uni_modules/uni-grid/components/uni-grid/uni-grid",
+    "uni-grid-item": "/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -0,0 +1,91 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  padding: 2vw;
+}
+.content .one input {
+  padding: 2vw;
+  background-color: var(--f1Color);
+  font-size: var(--font14Size);
+  border-radius: 5px;
+}
+.content .two {
+  padding: 1vw 2vw;
+  background-color: var(--f9Color);
+}
+.content .two .grid {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 5px 0 0 0;
+  margin: 5px;
+  background-color: var(--mainColor);
+  border-radius: 10px;
+}
+.content .two .grid .image {
+  width: 25px;
+  height: 25px;
+}
+.content .two .grid .text {
+  font-size: var(--font14Size);
+  margin-top: 5px;
+}
+.content .thr {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+}
+.content .thr .thr_1 {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  padding: 2vw;
+}
+.content .thr .thr_1 .list {
+  display: flex;
+  flex-direction: column;
+  justify-content: inherit;
+  width: 43vw;
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .thr .thr_1 .list .image {
+  width: 100%;
+  height: 40vw;
+  border-top-right-radius: 10px;
+  border-top-left-radius: 10px;
+}
+.content .thr .thr_1 .list .name {
+  font-size: var(--font14Size);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "系统页",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -0,0 +1 @@
+<view class="main"><view class="one"><image class="logo" src="{{logoUrl}}"></image></view></view>

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -0,0 +1,20 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .one {
+  text-align: center;
+  margin: 40vw 0 0 0;
+}
+.main .one .logo {
+  width: 50vw;
+  height: 50vw;
+  border-radius: 90px;
+  box-shadow: 0 0 5px var(--f1Color);
+}
+

unpackage/dist/dev/mp-weixin/pages/login/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "登录",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/market/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "购物车",
+  "usingComponents": {
+    "uni-number-box": "/uni_modules/uni-number-box/components/uni-number-box/uni-number-box"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/market/index.wxss

@@ -0,0 +1,167 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  background-color: var(--footColor);
+}
+.main .one {
+  text-align: center;
+  margin: 2vw 0;
+}
+.main .one .logo {
+  margin: 10vw 0 2vw 0;
+}
+.main .one .logo .iconfont {
+  font-size: 35vw;
+}
+.main .one .one_1 {
+  margin: 3vw 0;
+}
+.main .one button {
+  background-color: var(--f3CColor);
+}
+.main .two {
+  display: flex;
+  background-color: var(--mainColor);
+  height: 35px;
+  margin: 0 0 4px 0;
+  padding: 5px 4vw;
+}
+.main .two .text_1 {
+  flex-grow: 1;
+  line-height: 30px;
+}
+.main .two .text_2 {
+  line-height: 35px;
+}
+.main .thr {
+  position: relative;
+  flex-grow: 1;
+  margin: 0 2vw;
+}
+.main .thr .list_1 {
+  background-color: var(--mainColor);
+  margin: 2vw 0;
+  padding: 2vw 2.5vw;
+  border-radius: 4px;
+}
+.main .thr .list_1 .title {
+  border-bottom: 1px solid var(--fcColor);
+  padding: 0 0 2vw 0;
+  font-size: var(--font18Size);
+}
+.main .thr .list_1 .title text {
+  margin: 0 1vw;
+}
+.main .thr .list_1 .content {
+  display: flex;
+  padding: 2vw 0;
+  font-size: var(--font16Size);
+  border-bottom: 1px dashed var(--fcColor);
+}
+.main .thr .list_1 .content .box {
+  line-height: 20vw;
+}
+.main .thr .list_1 .content .img {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 2vw;
+  border: 1px solid var(--fcColor);
+}
+.main .thr .list_1 .content .img image {
+  width: 20vw;
+  height: 20vw;
+}
+.main .thr .list_1 .content .thr_1 {
+  width: 60vw;
+  margin: 0 0 0 2vw;
+}
+.main .thr .list_1 .content .thr_1 .left {
+  display: flex;
+  justify-content: space-between;
+}
+.main .thr .list_1 .content .thr_1 .left .other {
+  margin: 0 2vw;
+}
+.main .thr .list_1 .content .thr_1 .left .other .money {
+  text-align: right;
+  flex-grow: 1;
+}
+.main .thr .list_1 .content .thr_1 .right {
+  margin: 2vw 0 0 0;
+}
+.main .thr .list_1 .content .thr_1 .right .title_1 {
+  font-size: var(--font12Size);
+  color: #666;
+}
+.main .thr .list_1 .content .thr_1 .right .title_1 text {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  background-color: #eee;
+  padding: 5px;
+}
+.main .thr .list_1 .content .num {
+  margin: 6vw 4vw;
+  font-size: var(--font20Size);
+}
+.main .thr .list_1 .content .del {
+  margin: 6vw 0;
+  text-align: right;
+  flex-grow: 1;
+}
+.main .foot {
+  background-color: var(--fffColor);
+  display: flex;
+  justify-content: space-between;
+  height: 45px;
+  padding: 0 0 0 6vw;
+  border-right: 1px solid var(--f99Color);
+}
+.main .foot .total {
+  flex-grow: 1;
+  display: flex;
+  align-content: flex-end;
+  line-height: 40px;
+}
+.main .foot .total text {
+  color: var(--f3CColor);
+}
+.main .foot .btn button {
+  width: 30vw;
+  height: 45px;
+  line-height: 45px;
+  border-radius: 0px;
+  background-color: var(--f3CColor);
+  font-weight: normal;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+checkbox .wx-checkbox-input {
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+  border-color: var(--f99Color);
+  background-color: var(--mainColor);
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+  border-color: var(--f3CColor);
+  background-color: var(--f3CColor);
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+  color: var(--fffColor);
+}
+

unpackage/dist/dev/mp-weixin/pages/my/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "我的",
+  "usingComponents": {
+    "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/my/index.wxss

@@ -0,0 +1,114 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  background-color: var(--f9Color);
+}
+.content .one {
+  display: flex;
+  align-items: center;
+  background: repeating-linear-gradient(to bottom, var(--f3CColor), var(--mainColor));
+  padding: 5vw;
+}
+.content .one .logo {
+  width: 15vw;
+  height: 15vw;
+  border-radius: 90px;
+}
+.content .one .one_1 {
+  display: flex;
+  flex-direction: column;
+  padding: 0 2vw;
+}
+.content .one .one_1 .name {
+  margin: 0 0 1vw 0;
+  font-size: var(--font16Size);
+}
+.content .one .one_1 .gender {
+  color: var(--f85Color);
+  font-size: var(--font13Size);
+}
+.content .two {
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .two .two_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+  border-bottom: 1px solid var(--f9Color);
+}
+.content .two .two_1 .left {
+  font-weight: 600;
+  font-size: var(--font14Size);
+}
+.content .two .two_1 .right {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+  color: var(--f99Color);
+}
+.content .two .two_2 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+}
+.content .two .two_2 .list {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+.content .two .two_2 .list .icon .iconfont {
+  font-size: 25px;
+}
+.content .two .two_2 .list .title {
+  display: inline-block;
+  margin: 2vw 0 0 0;
+  font-size: var(--font12Size);
+}
+.content .thr {
+  display: flex;
+  flex-direction: column;
+  margin: 2vw;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .thr .list {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw;
+  border-bottom: 1px solid var(--f9Color);
+}
+.content .thr .list .left {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+}
+.content .thr .list .left .icon {
+  padding: 0 2vw 0 0;
+}
+.content .thr .list .left .icon .iconfont {
+  color: var(--f3CColor);
+  font-size: 20px;
+}
+.content .thr .list .left .title {
+  display: inline-block;
+  font-size: var(--font12Size);
+}
+.content .thr .list .right {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+  color: var(--f99Color);
+}
+

unpackage/dist/dev/mp-weixin/pages/register/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "注册",
+  "usingComponents": {
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/register/index.wxss

@@ -0,0 +1,16 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+}
+.content .one {
+  padding: 3vw;
+}
+.content .one .button {
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesGoods/index/index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "商品详情",
+  "usingComponents": {
+    "uni-goods-nav": "/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-number-box": "/uni_modules/uni-number-box/components/uni-number-box/uni-number-box"
+  }
+}

unpackage/dist/dev/mp-weixin/pagesGoods/index/index.wxss

@@ -0,0 +1,211 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  position: relative;
+  flex-grow: 1;
+}
+.content .one .one_1 {
+  border-bottom: 0.5vw solid var(--f9Color);
+}
+.content .one .one_1 swiper {
+  height: 44vh !important;
+}
+.content .one .one_1 .list {
+  border-radius: 5px;
+}
+.content .one .one_1 .list .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+  background-color: #fff;
+}
+.content .one .one_2 {
+  border-bottom: 0.5vw solid var(--f9Color);
+  padding: 2vw;
+}
+.content .one .one_2 .money {
+  font-size: var(--font20Size);
+  padding: 0 1vw 0 0;
+  color: var(--fF0Color);
+  font-weight: bold;
+}
+.content .one .one_2 .money text {
+  font-size: var(--font14Size);
+}
+.content .one .one_3 {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 1vw;
+  border-bottom: 0.5vw solid var(--f9Color);
+}
+.content .one .one_4 {
+  border-bottom: 0.5vw solid var(--f9Color);
+  padding: 2vw;
+}
+.content .one .one_4 .name {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  font-size: var(--font17Size);
+  font-weight: bold;
+  margin: 0 0 2vw 0;
+}
+.content .one .one_4 .brief {
+  font-size: var(--font14Size);
+  color: var(--f85Color);
+  margin: 0 0 1vw 0;
+}
+.content .one .one_5 {
+  text-align: center;
+  margin: 0 0 15vw 0;
+}
+.content .one .one_5 .list .image {
+  border-radius: 5px;
+  background-color: #fff;
+}
+.content .bottom {
+  width: 100vw;
+  position: fixed;
+  bottom: 0;
+  left: 0px;
+  right: 0px;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.uni-popup {
+  z-index: 9999 !important;
+}
+.popup {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 60vh;
+}
+.popup .close {
+  text-align: right;
+  padding: 2vw;
+}
+.popup .specs_1 {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  height: 54vh;
+}
+.popup .specs_1 .info_1 {
+  position: relative;
+  flex-grow: 1;
+}
+.popup .specs_1 .info_1 .one .one_1 {
+  display: flex;
+  margin: 0 0 2vw 0;
+  padding: 0 0 2vw 2vw;
+  border-bottom: 0.5vw solid var(--f9Color);
+}
+.popup .specs_1 .info_1 .one .one_1 .l {
+  width: 25vw;
+  height: 25vw;
+}
+.popup .specs_1 .info_1 .one .one_1 .l .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+.popup .specs_1 .info_1 .one .one_1 .r {
+  width: 70vw;
+  padding: 0 0 0 2vw;
+}
+.popup .specs_1 .info_1 .one .one_1 .r .money {
+  margin: 0 0 2vw 0;
+}
+.popup .specs_1 .info_1 .one .one_1 .r .money .money_1 {
+  font-size: var(--font20Size);
+  color: var(--fF0Color);
+  padding: 0 2vw 0 0;
+}
+.popup .specs_1 .info_1 .one .one_1 .r .money .money_1 text {
+  font-size: var(--font14Size);
+}
+.popup .specs_1 .info_1 .one .one_1 .r .other_1 {
+  font-size: var(--font15Size);
+  color: var(--f85Color);
+}
+.popup .specs_1 .info_1 .one .one_1 .r .other_1 text:last-child {
+  color: var(--f00Color);
+}
+.popup .specs_1 .info_1 .one .one_2 {
+  margin: 0 0 2vw 0;
+  border-bottom: 0.5vw solid var(--f9Color);
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_1 {
+  font-size: var(--font14Size);
+  margin: 0 0 2vw 0;
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 {
+  display: flex;
+  flex-wrap: wrap;
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .list {
+  background-color: var(--f5Color);
+  margin: 0 2vw 2vw 0;
+  padding: 0.5vw 1vw;
+  border-radius: 5px;
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .list text {
+  font-size: var(--font14Size);
+  color: var(--f00Color);
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .huilist {
+  background-color: var(--fDCColor);
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .huilist text {
+  color: var(--f85Color);
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .redlist {
+  background-color: var(--f3CColor);
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .redlist text {
+  color: var(--mainColor);
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .huiilist {
+  background-color: var(--f80Color);
+}
+.popup .specs_1 .info_1 .one .one_2 .one_2_2 .huiilist text {
+  color: var(--fcColor);
+}
+.popup .specs_1 .info_1 .one .one_3 {
+  display: flex;
+}
+.popup .specs_1 .info_1 .one .one_3 .one_3_1 {
+  margin: 0 2vw 0 0;
+}
+.popup .specs_1 .info_1 .one .one_3 .one_3_1 text {
+  font-size: 14px;
+  color: var(--f85Color);
+}
+.popup .specs_1 .info_1 .one .one_3 .one_3_1 .limit {
+  color: var(--fF0Color);
+  padding: 0 0 0 2vw;
+}
+.popup .specs_1 .info_2 .button {
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  border-radius: 0;
+}
+

unpackage/dist/dev/mp-weixin/pagesGoods/shop/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "店铺",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pagesGoods/shop/index.wxss

@@ -0,0 +1,87 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  padding: 2vw;
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+}
+.content .one .one_1 {
+  font-size: var(--font16Size);
+  font-weight: 600;
+}
+.content .one .one_2 {
+  padding: 2vw 0;
+  font-size: var(--font14Size);
+}
+.content .two {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+}
+.content .two .two_1 {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  padding: 2vw;
+}
+.content .two .two_1 .list {
+  display: flex;
+  flex-direction: column;
+  justify-content: inherit;
+  width: 43vw;
+  padding: 2vw;
+  margin: 0 0 2vw 0;
+  border-radius: 10px;
+  background-color: var(--mainColor);
+}
+.content .two .two_1 .list .image {
+  width: 100%;
+  height: 40vw;
+  border-top-right-radius: 10px;
+  border-top-left-radius: 10px;
+}
+.content .two .two_1 .list .name {
+  font-size: var(--font14Size);
+}
+.content .two .two_1 .list .other {
+  padding: 1vw 0 0 0;
+  display: flex;
+  justify-content: space-between;
+}
+.content .two .two_1 .list .other .left {
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
+}
+.content .two .two_1 .list .other .right {
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
+}
+

unpackage/dist/dev/mp-weixin/pagesGoods/sort/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "商品分类",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}