From 5776f4f5be2d5aa37a1e928ba95567dfc2e97d5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 12 七月 2024 15:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 37
wechat_jiaxuan/pages/userinfo/mysub.js | 70
server/service/src/main/java/com/doumee/dao/business/model/Customer.java | 6
wechat_jiaxuan/pages/userinfo/index.wxml | 52
wechat_jiaxuan/pages/userinfo/collect.less | 80 +
wechat_jiaxuan/components/disProduct/index.less | 5
server/service/src/main/java/com/doumee/dao/web/reqeust/FreeCustomizationDTO.java | 48
wechat_jiaxuan/pages/sets/index.wxss | 55
wechat_jiaxuan/pages/detailDis/product.wxml | 61
wechat_jiaxuan/pages/detailDis/realpic.wxml | 36
wechat_jiaxuan/components/disRealpic/index.json | 4
wechat_jiaxuan/pages/userinfo/mysub.json | 4
wechat_jiaxuan/pages/consult/detail.wxml | 26
wechat_jiaxuan/pages/userinfo/favorite.wxml | 60
wechat_jiaxuan/pages/discover/discover.json | 4
wechat_jiaxuan/pages/mine/mine.less | 75 +
wechat_jiaxuan/pages/detailDis/case.wxml | 48
wechat_jiaxuan/components/disCase/index.wxss | 155 ++
wechat_jiaxuan/pages/sets/protocol.json | 3
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 202 ++
wechat_jiaxuan/pages/userinfo/index.less | 62
server/service/src/main/java/com/doumee/service/business/CustomerService.java | 22
wechat_jiaxuan/pages/detailDis/realpic.less | 73 +
wechat_jiaxuan/pages/detailDis/case.js | 69
wechat_jiaxuan/project.private.config.json | 18
wechat_jiaxuan/components/disCase/index.less | 163 ++
wechat_jiaxuan/components/disRealpic/index.wxml | 119 +
wechat_jiaxuan/pages/sets/index.js | 77 +
wechat_jiaxuan/pages/mine/mine.wxss | 67
wechat_jiaxuan/pages/sets/index.less | 55
wechat_jiaxuan/pages/userinfo/mysub.wxss | 78 +
wechat_jiaxuan/pages/userinfo/collect.wxss | 79 +
wechat_jiaxuan/components/disProduct/index.wxml | 2
wechat_jiaxuan/static/icon/mine_ic_ar.png | 0
wechat_jiaxuan/pages/detailDis/product.json | 3
wechat_jiaxuan/pages/userinfo/index.wxss | 62
wechat_jiaxuan/pages/detailDis/case.json | 4
wechat_jiaxuan/pages/detailDis/realpic.js | 69
wechat_jiaxuan/components/disProduct/index.js | 5
wechat_jiaxuan/pages/detailDis/realpic.json | 4
wechat_jiaxuan/pages/sets/index.wxml | 27
wechat_jiaxuan/pages/userinfo/mysub.less | 78 +
wechat_jiaxuan/pages/userinfo/favorite.less | 80 +
wechat_jiaxuan/components/disRealpic/index.less | 168 ++
wechat_jiaxuan/app.json | 27
wechat_jiaxuan/pages/mine/mine.js | 16
wechat_jiaxuan/pages/userinfo/collect.js | 72 +
wechat_jiaxuan/pages/detailDis/product.wxss | 174 ++
wechat_jiaxuan/pages/sets/protocol.wxss | 1
wechat_jiaxuan/pages/userinfo/collect.json | 4
wechat_jiaxuan/pages/discover/discover.wxml | 2
wechat_jiaxuan/pages/detailDis/realpic.wxss | 66
wechat_jiaxuan/pages/userinfo/favorite.wxss | 80 +
wechat_jiaxuan/pages/consult/detail.wxss | 15
wechat_jiaxuan/pages/detailDis/product.js | 69
wechat_jiaxuan/pages/userinfo/index.js | 93 +
wechat_jiaxuan/components/disCase/index.js | 34
wechat_jiaxuan/pages/consult/detail.less | 17
wechat_jiaxuan/components/disCase/index.json | 4
wechat_jiaxuan/pages/detailDis/case.wxss | 90 +
wechat_jiaxuan/components/disCase/index.wxml | 119 +
wechat_jiaxuan/pages/userinfo/favorite.js | 72 +
server/service/src/main/java/com/doumee/dao/web/reqeust/RenovationCalculatorDTO.java | 36
wechat_jiaxuan/pages/sets/protocol.wxml | 2
wechat_jiaxuan/pages/sets/index.json | 6
wechat_jiaxuan/pages/sets/protocol.js | 66
wechat_jiaxuan/pages/detailDis/product.less | 200 ++
wechat_jiaxuan/components/disRealpic/index.js | 34
wechat_jiaxuan/pages/detailDis/case.less | 103 +
server/service/src/main/java/com/doumee/dao/web/reqeust/TestTrimStyleDTO.java | 48
wechat_jiaxuan/pages/mine/mine.wxml | 42
wechat_jiaxuan/components/disRealpic/index.wxss | 160 ++
wechat_jiaxuan/pages/userinfo/mysub.wxml | 110 +
wechat_jiaxuan/pages/userinfo/index.json | 6
server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java | 12
wechat_jiaxuan/components/disProduct/index.wxss | 3
wechat_jiaxuan/pages/userinfo/collect.wxml | 60
wechat_jiaxuan/pages/userinfo/favorite.json | 4
78 files changed, 4,199 insertions(+), 63 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Customer.java b/server/service/src/main/java/com/doumee/dao/business/model/Customer.java
index 2fbe6c7..17fb7e8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Customer.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Customer.java
@@ -94,6 +94,9 @@
@ExcelColumn(name="鍖哄煙")
private String areaName;
+ @ApiModelProperty(value = "鍖哄煙缂栫爜")
+ @ExcelColumn(name="鍖哄煙缂栫爜")
+ private String areaCode;
@ApiModelProperty(value = "绯荤粺鐗堟湰")
@ExcelColumn(name="绯荤粺鐗堟湰")
private String sysVersion;
@@ -118,8 +121,5 @@
@ExcelColumn(name="鐪佷唤缂栫爜")
private String provinceCode;
- @ApiModelProperty(value = "鍖哄煙缂栫爜")
- @ExcelColumn(name="鍖哄煙缂栫爜")
- private String areaCode;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
index d56661d..983fec9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CustomerLog.java
@@ -138,4 +138,16 @@
@ExcelColumn(name="crm鎻愪氦澶囨敞")
private String crmInfo;
+ @ApiModelProperty(value = "鍖哄煙")
+ @ExcelColumn(name="鍖哄煙")
+ private String areaName;
+
+ @ApiModelProperty(value = "鍖哄煙缂栫爜")
+ @ExcelColumn(name="鍖哄煙缂栫爜")
+ private String areaCode;
+
+ @ApiModelProperty(value = "濮撳悕")
+ @ExcelColumn(name="濮撳悕")
+ private String name;
+
}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/FreeCustomizationDTO.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/FreeCustomizationDTO.java
new file mode 100644
index 0000000..b337e14
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/reqeust/FreeCustomizationDTO.java
@@ -0,0 +1,48 @@
+package com.doumee.dao.web.reqeust;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/11 17:19
+ */
+@Data
+@ApiModel("0鍏冨畾鍒舵姤鍚嶈姹傜被")
+public class FreeCustomizationDTO {
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭", hidden = true)
+ private long memberId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+
+ @ApiModelProperty(value = "鐪佷唤")
+ private String provinceName;
+
+ @ApiModelProperty(value = "鍩庡競")
+ private String cityName;
+
+ @ApiModelProperty(value = "鍖哄煙")
+ private String areaName;
+
+ @ApiModelProperty(value = "鍩庡競缂栫爜")
+ private String cityCode;
+
+ @ApiModelProperty(value = "鐪佷唤缂栫爜")
+ private String provinceCode;
+
+ @ApiModelProperty(value = "鍖哄煙缂栫爜")
+ private String areaCode;
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/RenovationCalculatorDTO.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/RenovationCalculatorDTO.java
new file mode 100644
index 0000000..7bd7a38
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/reqeust/RenovationCalculatorDTO.java
@@ -0,0 +1,36 @@
+package com.doumee.dao.web.reqeust;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/11 17:19
+ */
+@Data
+@ApiModel("瑁呬慨璁＄畻璇锋眰绫�")
+public class RenovationCalculatorDTO {
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭", hidden = true)
+ private long memberId;
+
+ @ApiModelProperty(value = "鎴垮眿绫诲瀷锛�0绮捐 1姣涘澂")
+ private String houseStatus;
+
+ @ApiModelProperty(value = "鎴峰瀷淇℃伅锛�0涓�瀹や竴鍘� 1涓ゅ涓�鍘� 2涓ゅ涓ゅ巺 3涓夊涓ゅ巺 4鍥涘涓ゅ巺 5浜斿涓ゅ巺鍙婁互涓�")
+ private String houseType;
+
+ @ApiModelProperty(value = "鎴垮眿闈㈢Н")
+ private String area;
+
+ @ApiModelProperty(value = "瑁呬慨棰勭畻锛堜竾鍏冿級")
+ private BigDecimal budget;
+
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/TestTrimStyleDTO.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/TestTrimStyleDTO.java
new file mode 100644
index 0000000..1a428c9
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/reqeust/TestTrimStyleDTO.java
@@ -0,0 +1,48 @@
+package com.doumee.dao.web.reqeust;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/11 17:19
+ */
+@Data
+@ApiModel("娴嬭瘯瑁呬慨椋庢牸璇锋眰绫�")
+public class TestTrimStyleDTO {
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭", hidden = true)
+ private long memberId;
+
+ @ApiModelProperty(value = "鎴垮瓙鎴峰瀷锛�0涓�灞� 1涓ゅ眳 2涓夊眳 3鍥涘眳鍙婁互涓�")
+ private String houseType;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "鎬у埆 0鐢� 1濂�")
+ private Integer sex;
+
+ @ApiModelProperty(value = "骞撮緞娈� 0-70鍚� 1-80鍚� 2-90鍚� 3-00鍚�")
+ private String ageInfo;
+
+ @ApiModelProperty(value = "椋庢牸锛堥鏍兼祴璇曠敤锛� 0-5")
+ private String styleInfo;
+
+ @ApiModelProperty(value = "鐪佷唤")
+ private String provinceName;
+
+ @ApiModelProperty(value = "鍩庡競")
+ private String cityName;
+
+ @ApiModelProperty(value = "鍩庡競缂栫爜")
+ private String cityCode;
+
+ @ApiModelProperty(value = "鐪佷唤缂栫爜")
+ private String provinceCode;
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/service/business/CustomerService.java b/server/service/src/main/java/com/doumee/service/business/CustomerService.java
index 4f07e5a..e496dc0 100644
--- a/server/service/src/main/java/com/doumee/service/business/CustomerService.java
+++ b/server/service/src/main/java/com/doumee/service/business/CustomerService.java
@@ -3,6 +3,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Customer;
+import com.doumee.dao.web.reqeust.FreeCustomizationDTO;
+import com.doumee.dao.web.reqeust.RenovationCalculatorDTO;
+import com.doumee.dao.web.reqeust.TestTrimStyleDTO;
+
import java.util.List;
/**
@@ -94,4 +98,22 @@
* @return long
*/
long count(Customer customer);
+
+ /**
+ * 鎴垮眿瑁呬慨璁＄畻鍣ㄤ俊鎭瓨鍌�
+ * @param renovationCalculatorDTO
+ */
+ void saveRenovationCalculator(RenovationCalculatorDTO renovationCalculatorDTO);
+
+ /**
+ * 0鍏冨畾鍒朵俊鎭�
+ * @param freeCustomizationDTO
+ */
+ void saveFreeCustomizationApply(FreeCustomizationDTO freeCustomizationDTO);
+
+ /**
+ * 娴嬭瘯瑁呬慨椋庢牸
+ * @param testTrimStyleDTO
+ */
+ void saveTestTrimStyle(TestTrimStyleDTO testTrimStyleDTO);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
index fd74554..2e84db3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
@@ -1,20 +1,38 @@
package com.doumee.service.business.impl;
+import com.alibaba.druid.sql.visitor.functions.Concat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.CustomerLogMapper;
import com.doumee.dao.business.CustomerMapper;
+import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.Customer;
+import com.doumee.dao.business.model.CustomerLog;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.FreeCustomizationDTO;
+import com.doumee.dao.web.reqeust.RenovationCalculatorDTO;
+import com.doumee.dao.web.reqeust.TestTrimStyleDTO;
+import com.doumee.service.business.CustomerLogService;
import com.doumee.service.business.CustomerService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.checkerframework.checker.units.qual.A;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 瀹㈡埛淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +44,13 @@
@Autowired
private CustomerMapper customerMapper;
+
+ @Autowired
+ private CustomerLogMapper customerLogMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
+
@Override
public Long create(Customer customer) {
@@ -185,13 +210,186 @@
- public void saveRenovationCalculator(){
+ @Override
+ public void saveRenovationCalculator(RenovationCalculatorDTO renovationCalculatorDTO){
+ if(Objects.isNull(renovationCalculatorDTO)
+ || Objects.isNull(renovationCalculatorDTO.getMemberId())
+ || Objects.isNull(renovationCalculatorDTO.getHouseStatus())
+ || Objects.isNull(renovationCalculatorDTO.getHouseType())
+ || Objects.isNull(renovationCalculatorDTO.getBudget())
+ || StringUtils.isEmpty(renovationCalculatorDTO.getArea())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectById(renovationCalculatorDTO.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
+ }
+ if(StringUtils.isEmpty(member.getPhone())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈巿鏉冩墜鏈哄彿");
+ }
+ Customer customer = customerMapper.selectOne(new QueryWrapper<Customer>().lambda().eq(Customer::getPhone,member.getPhone()).eq(Customer::getIsdeleted, Constants.ZERO).last("limit 1"));
+ if(Objects.isNull(customer)){
+ customer = new Customer();
+ customer.setIsdeleted(Constants.ZERO);
+ customer.setPhone(member.getPhone());
+ customer.setCreateDate(new Date());
+ } else{
+ customer.setEditDate(new Date());
+ }
+ customer.setOpenid(member.getOpenid());
+ customer.setMemberId(member.getId());
+ customerMapper.insertOrUpdate(customer);
-
+ //瀛樺偍 customerLog 鏁版嵁
+ CustomerLog customerLog = new CustomerLog();
+ customerLog.setCreateDate(new Date());
+ customerLog.setIsdeleted(Constants.ZERO);
+ customerLog.setType(Constants.TWO);
+ customerLog.setCrmStatus(Constants.ZERO);
+ customerLog.setPhone(customer.getPhone());
+ customerLog.setBudget(renovationCalculatorDTO.getBudget().multiply(new BigDecimal(10000)).toString());
+ customerLog.setHouseStatus(renovationCalculatorDTO.getHouseStatus());
+ customerLog.setArea(renovationCalculatorDTO.getArea());
+ customerLog.setHouseType(renovationCalculatorDTO.getHouseType());
+ customerLog.setCostomerId(customer.getId().toString());
+ customerLogMapper.insert(customerLog);
}
+ @Override
+ public void saveFreeCustomizationApply(FreeCustomizationDTO freeCustomizationDTO){
+ if(Objects.isNull(freeCustomizationDTO)
+ || Objects.isNull(freeCustomizationDTO.getMemberId())
+ || StringUtils.isEmpty(freeCustomizationDTO.getName())
+ || StringUtils.isEmpty(freeCustomizationDTO.getPhone())
+ || StringUtils.isEmpty(freeCustomizationDTO.getCityCode())
+ || StringUtils.isEmpty(freeCustomizationDTO.getCityName())
+ || StringUtils.isEmpty(freeCustomizationDTO.getProvinceName())
+ || StringUtils.isEmpty(freeCustomizationDTO.getProvinceCode())
+ || StringUtils.isEmpty(freeCustomizationDTO.getAreaCode())
+ || StringUtils.isEmpty(freeCustomizationDTO.getAreaName())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectById(freeCustomizationDTO.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
+ }
+ if(StringUtils.isEmpty(member.getPhone())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈巿鏉冩墜鏈哄彿");
+ }
+ Customer customer = customerMapper.selectOne(new QueryWrapper<Customer>().lambda()
+ .eq(Customer::getPhone,freeCustomizationDTO.getPhone()).eq(Customer::getIsdeleted, Constants.ZERO).last("limit 1"));
+ if(Objects.isNull(customer)){
+ customer = new Customer();
+ customer.setPhone(freeCustomizationDTO.getPhone());
+ customer.setCreateDate(new Date());
+ customer.setIsdeleted(Constants.ZERO);
+ } else{
+ customer.setEditDate(new Date());
+ }
+ customer.setOpenid(member.getOpenid());
+ customer.setMemberId(member.getId());
+ customer.setName(freeCustomizationDTO.getName());
+
+ customer.setProName(freeCustomizationDTO.getProvinceName());
+ customer.setCityName(freeCustomizationDTO.getCityName());
+ customer.setAreaName(freeCustomizationDTO.getAreaName());
+ customer.setProvinceCode(freeCustomizationDTO.getProvinceCode());
+ customer.setCityCode(freeCustomizationDTO.getCityCode());
+ customer.setAreaCode(freeCustomizationDTO.getAreaCode());
+ customerMapper.insertOrUpdate(customer);
+
+ //瀛樺偍 customerLog 鏁版嵁
+ CustomerLog customerLog = new CustomerLog();
+ customerLog.setCreateDate(new Date());
+ customerLog.setIsdeleted(Constants.ZERO);
+ customerLog.setType(Constants.ONE);
+ customerLog.setCrmStatus(Constants.ZERO);
+ customerLog.setPhone(customer.getPhone());
+ customerLog.setCostomerId(customer.getId().toString());
+
+ customerLog.setProvinceName(freeCustomizationDTO.getProvinceName());
+ customerLog.setCityName(freeCustomizationDTO.getCityName());
+ customerLog.setAreaCode(freeCustomizationDTO.getAreaName());
+ customerLog.setProvicneCode(freeCustomizationDTO.getProvinceCode());
+ customerLog.setCityCode(freeCustomizationDTO.getCityCode());
+ customerLog.setAreaCode(freeCustomizationDTO.getAreaCode());
+ customerLog.setName(freeCustomizationDTO.getName());
+ customerLog.setPhone(freeCustomizationDTO.getPhone());
+ customerLogMapper.insert(customerLog);
+ }
+
+ @Override
+ public void saveTestTrimStyle(TestTrimStyleDTO testTrimStyleDTO){
+ if(Objects.isNull(testTrimStyleDTO)
+ || Objects.isNull(testTrimStyleDTO.getMemberId())
+
+ || StringUtils.isEmpty(testTrimStyleDTO.getStyleInfo())
+ || StringUtils.isEmpty(testTrimStyleDTO.getAgeInfo())
+ || Objects.isNull(testTrimStyleDTO.getSex())
+ || StringUtils.isEmpty(testTrimStyleDTO.getHouseType())
+ || StringUtils.isEmpty(testTrimStyleDTO.getAgeInfo())
+ || StringUtils.isEmpty(testTrimStyleDTO.getPhone())
+
+ || StringUtils.isEmpty(testTrimStyleDTO.getCityCode())
+ || StringUtils.isEmpty(testTrimStyleDTO.getCityName())
+ || StringUtils.isEmpty(testTrimStyleDTO.getProvinceName())
+ || StringUtils.isEmpty(testTrimStyleDTO.getProvinceCode())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Member member = memberMapper.selectById(testTrimStyleDTO.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
+ }
+ if(StringUtils.isEmpty(member.getPhone())){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈巿鏉冩墜鏈哄彿");
+ }
+ Customer customer = customerMapper.selectOne(new QueryWrapper<Customer>().lambda()
+ .eq(Customer::getPhone,testTrimStyleDTO.getPhone()).eq(Customer::getIsdeleted, Constants.ZERO).last("limit 1"));
+ if(Objects.isNull(customer)){
+ customer = new Customer();
+ customer.setPhone(testTrimStyleDTO.getPhone());
+ customer.setCreateDate(new Date());
+ customer.setIsdeleted(Constants.ZERO);
+ } else{
+ customer.setEditDate(new Date());
+ }
+ customer.setOpenid(member.getOpenid());
+ customer.setMemberId(member.getId());
+
+ customer.setProName(testTrimStyleDTO.getProvinceName());
+ customer.setCityName(testTrimStyleDTO.getCityName());
+ customer.setProvinceCode(testTrimStyleDTO.getProvinceCode());
+ customer.setCityCode(testTrimStyleDTO.getCityCode());
+ customerMapper.insertOrUpdate(customer);
+
+ //瀛樺偍 customerLog 鏁版嵁
+ CustomerLog customerLog = new CustomerLog();
+ customerLog.setCreateDate(new Date());
+ customerLog.setIsdeleted(Constants.ZERO);
+ customerLog.setType(Constants.ZERO);
+ customerLog.setCrmStatus(Constants.ZERO);
+ customerLog.setPhone(customer.getPhone());
+ customerLog.setCostomerId(customer.getId().toString());
+
+ customerLog.setProvinceName(testTrimStyleDTO.getProvinceName());
+ customerLog.setCityName(testTrimStyleDTO.getCityName());
+ customerLog.setProvicneCode(testTrimStyleDTO.getProvinceCode());
+ customerLog.setCityCode(testTrimStyleDTO.getCityCode());
+
+ customerLog.setAgeInfo(testTrimStyleDTO.getAgeInfo());
+ customerLog.setHouseType(testTrimStyleDTO.getHouseType());
+ customerLog.setStyleInfo(testTrimStyleDTO.getStyleInfo());
+ customerLog.setSex(testTrimStyleDTO.getSex());
+ customerLog.setAgeInfo(testTrimStyleDTO.getAgeInfo());
+ customerLog.setPhone(testTrimStyleDTO.getPhone());
+ customerLogMapper.insert(customerLog);
+ }
+
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index 3dbee62..badafea 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -4,8 +4,7 @@
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.web.reqeust.EditMemberRequest;
-import com.doumee.dao.web.reqeust.WxPhoneRequest;
+import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.BjParamConfigResponse;
import com.doumee.service.business.BjParamService;
@@ -94,8 +93,42 @@
}
+ @LoginRequired
+ @ApiOperation(value = "瑁呬慨璁＄畻鍣ㄤ俊鎭瓨鍌�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/saveRenovationCalculator")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse saveRenovationCalculator(@RequestBody RenovationCalculatorDTO renovationCalculatorDTO) {
+ renovationCalculatorDTO.setMemberId(getMemberId());
+ customerService.saveRenovationCalculator(renovationCalculatorDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+ @LoginRequired
+ @ApiOperation(value = "0鍏冨畾鍒朵俊鎭�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/saveFreeCustomizationApply")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse saveFreeCustomizationApply(@RequestBody FreeCustomizationDTO freeCustomizationDTO) {
+ freeCustomizationDTO.setMemberId(getMemberId());
+ customerService.saveFreeCustomizationApply(freeCustomizationDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "娴嬭瘯瑁呬慨椋庢牸", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/saveTestTrimStyle")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) {
+ testTrimStyleDTO.setMemberId(getMemberId());
+ customerService.saveTestTrimStyle(testTrimStyleDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index ebd3ce0..05c3a27 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -12,21 +12,22 @@
"pages/store/staff",
"pages/store/staffList",
"pages/calculator/index",
- "pages/webView/index"
+ "pages/webView/index",
+ "pages/detailDis/product",
+ "pages/detailDis/case",
+ "pages/detailDis/realpic",
+ "pages/userinfo/index",
+ "pages/userinfo/mysub",
+ "pages/userinfo/collect",
+ "pages/userinfo/favorite",
+ "pages/sets/index",
+ "pages/sets/protocol"
],
"window": {
"navigationBarTitleText": "蹇楅偊瀹堕��",
"navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "#fff"
- },
- "renderer": "skyline",
- "rendererOptions": {
- "skyline": {
- "defaultDisplayBlock": true,
- "disableABTest": true,
- "sdkVersionBegin": "3.0.0",
- "sdkVersionEnd": "15.255.255"
- }
+ "navigationBarBackgroundColor": "#fff",
+ "navigationStyle": "default"
},
"tabBar": {
"color": "#999",
@@ -65,6 +66,10 @@
"van-empty": "@vant/weapp/empty/index",
"navBar": "./components/navBar/navBar"
},
+ "requiredPrivateInfos": [
+ "getLocation",
+ "chooseLocation"
+ ],
"permission": {
"scope.userLocation": {
"desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
diff --git a/wechat_jiaxuan/components/disCase/index.js b/wechat_jiaxuan/components/disCase/index.js
new file mode 100644
index 0000000..a76c4eb
--- /dev/null
+++ b/wechat_jiaxuan/components/disCase/index.js
@@ -0,0 +1,34 @@
+// components/disCase/index.js
+Component({
+ /**
+ * 缁勪欢鐨勫睘鎬у垪琛�
+ */
+ properties: {
+
+ },
+ data: {
+ showParams: false,
+ activeStatus: '0'
+ },
+ methods: {
+ handleDetail(e) {
+ wx.navigateTo({
+ url: '/pages/detailDis/case',
+ })
+ },
+ changeShowParams(){
+ const showParams = !this.data.showParams
+ this.setData({showParams})
+ // this.setData({showTwo: false})
+ },
+ changeTwo(){
+ const showTwo = !this.data.showTwo
+ this.setData({showTwo})
+ this.setData({showOne: false})
+ },
+ statusChange(e) {
+ const activeStatus = e.currentTarget.dataset.status
+ this.setData({activeStatus})
+ }
+ }
+})
diff --git a/wechat_jiaxuan/components/disCase/index.json b/wechat_jiaxuan/components/disCase/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/wechat_jiaxuan/components/disCase/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disCase/index.less b/wechat_jiaxuan/components/disCase/index.less
new file mode 100644
index 0000000..10e7bfb
--- /dev/null
+++ b/wechat_jiaxuan/components/disCase/index.less
@@ -0,0 +1,163 @@
+.search_wrap {
+ width: 670rpx;
+ height: 72rpx;
+ margin: 24rpx auto;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ padding: 0 40rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+
+ image {
+ width: 28rpx;
+ margin-right: 16rpx;
+ }
+}
+
+.app {
+ height: 100%;
+ width: 100%;
+}
+
+.main_content {
+ height: calc(100% - 120rpx);
+ .query_wrap {
+ display: flex;
+ padding: 0 16rpx;
+ .item {
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+ flex: 1;
+ .name {
+ margin-right: 6rpx;
+ }
+ }
+ }
+ .query_param {
+ position: absolute;
+ z-index: 99;
+ background-color: #fff;
+ width: 100%;
+ .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+ .item {
+ width: 202rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden; //鏂囨湰瓒呭嚭闅愯棌
+ text-overflow: ellipsis;
+ margin-right: 24rpx;
+ margin-bottom: 24rpx;
+
+ &:nth-of-type(3n) {
+ margin-right: 0;
+ }
+ }
+ .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+ }
+ }
+ .btns {
+ display: flex;
+ .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .sub {
+ background: var(--themeColor);
+ color: #fff;
+ }
+ }
+ }
+
+ .status {
+ display: flex;
+ padding: 0rpx 40rpx;
+ margin: 20rpx 0;
+ align-items: center;
+
+ .active {
+ color: var(--themeColor);
+ }
+
+ .separate {
+ margin: 0 12rpx;
+ width: 1rpx;
+ height: 28rpx;
+ background-color: #333333;
+ }
+ }
+ .goods_list{
+ padding: 12rpx 40rpx;
+ .item{
+ width: 100%;
+ margin-bottom: 32rpx;
+ .img_wrap{
+ width: 100%;
+ height: 376rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+ .img{
+ width: 100%;
+ height: 100%;
+ }
+ .new{
+ width: 72rpx;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 10;
+ }
+ }
+ .content{
+ display: flex;
+ justify-content: space-between;
+ padding: 0 10rpx;
+ }
+ .name{
+ margin: 12rpx 0 8rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ flex: 1;
+ }
+ .info{
+ display: flex;
+ align-items: center;
+ color: #666666;
+ margin-left: 12rpx;
+ .icon{
+ width: 28rpx;
+ margin-right: 8rpx;
+ }
+ .num{
+ margin-right: 28rpx;
+ }
+ .primary{
+ color: var(--themeColor);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disCase/index.wxml b/wechat_jiaxuan/components/disCase/index.wxml
new file mode 100644
index 0000000..0e72d83
--- /dev/null
+++ b/wechat_jiaxuan/components/disCase/index.wxml
@@ -0,0 +1,119 @@
+<view class="app">
+ <view class="search_wrap">
+ <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
+ <input type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+ </view>
+ <!-- -->
+ <view class="main_content">
+ <view class="query_wrap">
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">椋庢牸</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">绌洪棿</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">闂村悕</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">闂寸О</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">绌虹О</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ </view>
+ <view wx:if="{{ showParams }}" class="query_param">
+ <view class="list">
+ <view class="item active">涓滆姖鐢佃</view>
+ <view class="item">涓滆姖鍟婄殑鏃舵拻鐨勪唬鐢佃</view>
+ <view class="item">涓滆姖鐢佃</view>
+ <view class="item">涓滆姖鐢佃</view>
+ <view class="item">涓滆姖鐢佃</view>
+ </view>
+ <view class="btns">
+ <view class="btn" bindtap="changeShowParams">鍙栨秷</view>
+ <view class="btn sub">纭</view>
+ </view>
+ </view>
+ <view class="status">
+ <view class="item {{ activeStatus == '0' ? 'active' : '' }}" data-status="0" bindtap="statusChange">榛樿</view>
+ <view class="separate"></view>
+ <view class="item {{ activeStatus == '1' ? 'active' : '' }}" data-status="1" bindtap="statusChange">鏈�鐑�</view>
+ <view class="separate"></view>
+ <view class="item {{ activeStatus == '2' ? 'active' : '' }}" data-status="2" bindtap="statusChange">鏈�鏂�</view>
+ </view>
+ <!-- goods_list -->
+ <view class="goods_list">
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disCase/index.wxss b/wechat_jiaxuan/components/disCase/index.wxss
new file mode 100644
index 0000000..21a13d7
--- /dev/null
+++ b/wechat_jiaxuan/components/disCase/index.wxss
@@ -0,0 +1,155 @@
+.search_wrap {
+ width: 670rpx;
+ height: 72rpx;
+ margin: 24rpx auto;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ padding: 0 40rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+}
+.search_wrap image {
+ width: 28rpx;
+ margin-right: 16rpx;
+}
+.app {
+ height: 100%;
+ width: 100%;
+}
+.main_content {
+ height: calc(100% - 120rpx);
+}
+.main_content .query_wrap {
+ display: flex;
+ padding: 0 16rpx;
+}
+.main_content .query_wrap .item {
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+ flex: 1;
+}
+.main_content .query_wrap .item .name {
+ margin-right: 6rpx;
+}
+.main_content .query_param {
+ position: absolute;
+ z-index: 99;
+ background-color: #fff;
+ width: 100%;
+}
+.main_content .query_param .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+}
+.main_content .query_param .list .item {
+ width: 202rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-right: 24rpx;
+ margin-bottom: 24rpx;
+}
+.main_content .query_param .list .item:nth-of-type(3n) {
+ margin-right: 0;
+}
+.main_content .query_param .list .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+}
+.main_content .query_param .btns {
+ display: flex;
+}
+.main_content .query_param .btns .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.main_content .query_param .btns .sub {
+ background: var(--themeColor);
+ color: #fff;
+}
+.main_content .status {
+ display: flex;
+ padding: 0rpx 40rpx;
+ margin: 20rpx 0;
+ align-items: center;
+}
+.main_content .status .active {
+ color: var(--themeColor);
+}
+.main_content .status .separate {
+ margin: 0 12rpx;
+ width: 1rpx;
+ height: 28rpx;
+ background-color: #333333;
+}
+.main_content .goods_list {
+ padding: 12rpx 40rpx;
+}
+.main_content .goods_list .item {
+ width: 100%;
+ margin-bottom: 32rpx;
+}
+.main_content .goods_list .item .img_wrap {
+ width: 100%;
+ height: 376rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+}
+.main_content .goods_list .item .img_wrap .img {
+ width: 100%;
+ height: 100%;
+}
+.main_content .goods_list .item .img_wrap .new {
+ width: 72rpx;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 10;
+}
+.main_content .goods_list .item .content {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 10rpx;
+}
+.main_content .goods_list .item .name {
+ margin: 12rpx 0 8rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ flex: 1;
+}
+.main_content .goods_list .item .info {
+ display: flex;
+ align-items: center;
+ color: #666666;
+ margin-left: 12rpx;
+}
+.main_content .goods_list .item .info .icon {
+ width: 28rpx;
+ margin-right: 8rpx;
+}
+.main_content .goods_list .item .info .num {
+ margin-right: 28rpx;
+}
+.main_content .goods_list .item .info .primary {
+ color: var(--themeColor);
+}
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
index fc3ea5f..ecc66a4 100644
--- a/wechat_jiaxuan/components/disProduct/index.js
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -16,6 +16,11 @@
activeStatus: '0'
},
methods: {
+ handleDetail(e) {
+ wx.navigateTo({
+ url: '/pages/detailDis/product',
+ })
+ },
changeOne(){
const showOne = !this.data.showOne
this.setData({showOne})
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
index 5e22d80..e3a87fb 100644
--- a/wechat_jiaxuan/components/disProduct/index.less
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -63,6 +63,7 @@
}
.query_form{
position: absolute;
+ z-index: 99;
background-color: #fff;
.list{
width: 100%;
@@ -79,7 +80,7 @@
font-size: 26rpx;
color: #333333;
white-space: nowrap;
- overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
+ overflow: hidden;
text-overflow: ellipsis;
margin-right: 24rpx;
margin-bottom: 24rpx;
@@ -147,7 +148,7 @@
position: absolute;
left: 0;
top: 0;
- z-index: 100;
+ z-index: 10;
}
}
.name{
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
index e262976..d9ce151 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxml
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -66,7 +66,7 @@
<view class="item {{ activeStatus == '2' ? 'active' : '' }}" data-status="2" bindtap="statusChange">鏈�鏂�</view>
</view>
<view class="goods_list">
- <view class="item">
+ <view class="item" bindtap="handleDetail">
<view class="img_wrap">
<image src="../../static/icon/test.png" class="img"></image>
<image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
index 7fb775c..e67a710 100644
--- a/wechat_jiaxuan/components/disProduct/index.wxss
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -64,6 +64,7 @@
}
.main_content .main_right .query_form {
position: absolute;
+ z-index: 99;
background-color: #fff;
}
.main_content .main_right .query_form .list {
@@ -151,7 +152,7 @@
position: absolute;
left: 0;
top: 0;
- z-index: 100;
+ z-index: 10;
}
.main_content .main_right .goods_list .item .name {
margin: 12rpx 0 8rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
new file mode 100644
index 0000000..17259f9
--- /dev/null
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -0,0 +1,34 @@
+// components/disCase/index.js
+Component({
+ /**
+ * 缁勪欢鐨勫睘鎬у垪琛�
+ */
+ properties: {
+
+ },
+ data: {
+ showParams: false,
+ activeStatus: '0'
+ },
+ methods: {
+ handleDetail(e) {
+ wx.navigateTo({
+ url: '/pages/detailDis/realpic',
+ })
+ },
+ changeShowParams(){
+ const showParams = !this.data.showParams
+ this.setData({showParams})
+ // this.setData({showTwo: false})
+ },
+ changeTwo(){
+ const showTwo = !this.data.showTwo
+ this.setData({showTwo})
+ this.setData({showOne: false})
+ },
+ statusChange(e) {
+ const activeStatus = e.currentTarget.dataset.status
+ this.setData({activeStatus})
+ }
+ }
+})
diff --git a/wechat_jiaxuan/components/disRealpic/index.json b/wechat_jiaxuan/components/disRealpic/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/wechat_jiaxuan/components/disRealpic/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
new file mode 100644
index 0000000..409cd72
--- /dev/null
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -0,0 +1,168 @@
+.search_wrap {
+ width: 670rpx;
+ height: 72rpx;
+ margin: 24rpx auto;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ padding: 0 40rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+
+ image {
+ width: 28rpx;
+ margin-right: 16rpx;
+ }
+}
+
+.app {
+ height: 100%;
+ width: 100%;
+}
+
+.main_content {
+ height: calc(100% - 120rpx);
+ .query_wrap {
+ display: flex;
+ padding: 0 16rpx;
+ .item {
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+ flex: 1;
+ .name {
+ margin-right: 6rpx;
+ }
+ }
+ }
+ .query_param {
+ position: absolute;
+ z-index: 99;
+ background-color: #fff;
+ width: 100%;
+ .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+ .item {
+ width: 202rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden; //鏂囨湰瓒呭嚭闅愯棌
+ text-overflow: ellipsis;
+ margin-right: 24rpx;
+ margin-bottom: 24rpx;
+
+ &:nth-of-type(3n) {
+ margin-right: 0;
+ }
+ }
+ .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+ }
+ }
+ .btns {
+ display: flex;
+ .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
+ .sub {
+ background: var(--themeColor);
+ color: #fff;
+ }
+ }
+ }
+
+ .status {
+ display: flex;
+ padding: 0rpx 40rpx;
+ margin: 20rpx 0;
+ align-items: center;
+
+ .active {
+ color: var(--themeColor);
+ }
+
+ .separate {
+ margin: 0 12rpx;
+ width: 1rpx;
+ height: 28rpx;
+ background-color: #333333;
+ }
+ }
+ .goods_list{
+ padding: 12rpx 40rpx;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ .item{
+ width: 324rpx;
+ margin-bottom: 60rpx;
+ .img_wrap{
+ width: 100%;
+ height: 182rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+ .img{
+ width: 100%;
+ height: 100%;
+ }
+ .tag{
+ padding: 0 10rpx;
+ height: 46rpx;
+ line-height: 46rpx;
+ text-align: center;
+ background: rgba(0,0,0,0.4);
+ border-radius: 8rpx;
+ position: absolute;
+ left: 12rpx;
+ top: 16rpx;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 10;
+ }
+ }
+ .name{
+ margin: 12rpx 0 8rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ flex: 1;
+ }
+ .info{
+ display: flex;
+ align-items: center;
+ color: #666666;
+ margin-left: 12rpx;
+ .icon{
+ width: 28rpx;
+ margin-right: 8rpx;
+ }
+ .num{
+ margin-right: 28rpx;
+ }
+ .primary{
+ color: var(--themeColor);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
new file mode 100644
index 0000000..b770866
--- /dev/null
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -0,0 +1,119 @@
+<view class="app">
+ <view class="search_wrap">
+ <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
+ <input type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+ </view>
+ <!-- -->
+ <view class="main_content">
+ <view class="query_wrap">
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">椋庢牸</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">绌洪棿</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">闂村悕</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">闂寸О</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ <view class="item" bindtap="changeShowParams">
+ <view class="name">绌虹О</view>
+ <van-icon name="{{ showParams ? 'arrow-up' : 'arrow-down' }}" />
+ </view>
+ </view>
+ <view wx:if="{{ showParams }}" class="query_param">
+ <view class="list">
+ <view class="item active">涓滆姖鐢佃</view>
+ <view class="item">涓滆姖鍟婄殑鏃舵拻鐨勪唬鐢佃</view>
+ <view class="item">涓滆姖鐢佃</view>
+ <view class="item">涓滆姖鐢佃</view>
+ <view class="item">涓滆姖鐢佃</view>
+ </view>
+ <view class="btns">
+ <view class="btn" bindtap="changeShowParams">鍙栨秷</view>
+ <view class="btn sub">纭</view>
+ </view>
+ </view>
+ <view class="status">
+ <view class="item {{ activeStatus == '0' ? 'active' : '' }}" data-status="0" bindtap="statusChange">榛樿</view>
+ <view class="separate"></view>
+ <view class="item {{ activeStatus == '1' ? 'active' : '' }}" data-status="1" bindtap="statusChange">鏈�鐑�</view>
+ <view class="separate"></view>
+ <view class="item {{ activeStatus == '2' ? 'active' : '' }}" data-status="2" bindtap="statusChange">鏈�鏂�</view>
+ </view>
+ <!-- goods_list -->
+ <view class="goods_list">
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <view class="tag">瀹炴媿</view>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="content">
+ <view class="name">閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸閽㈢惔鏇查挗鐞存洸</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
new file mode 100644
index 0000000..afcbd96
--- /dev/null
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -0,0 +1,160 @@
+.search_wrap {
+ width: 670rpx;
+ height: 72rpx;
+ margin: 24rpx auto;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ padding: 0 40rpx;
+ display: flex;
+ align-items: center;
+ background-color: #F7F7F7;
+}
+.search_wrap image {
+ width: 28rpx;
+ margin-right: 16rpx;
+}
+.app {
+ height: 100%;
+ width: 100%;
+}
+.main_content {
+ height: calc(100% - 120rpx);
+}
+.main_content .query_wrap {
+ display: flex;
+ padding: 0 16rpx;
+}
+.main_content .query_wrap .item {
+ height: 88rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #666666;
+ flex: 1;
+}
+.main_content .query_wrap .item .name {
+ margin-right: 6rpx;
+}
+.main_content .query_param {
+ position: absolute;
+ z-index: 99;
+ background-color: #fff;
+ width: 100%;
+}
+.main_content .query_param .list {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ padding: 30rpx 40rpx;
+}
+.main_content .query_param .list .item {
+ width: 202rpx;
+ height: 72rpx;
+ text-align: center;
+ line-height: 70rpx;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-size: 26rpx;
+ color: #333333;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-right: 24rpx;
+ margin-bottom: 24rpx;
+}
+.main_content .query_param .list .item:nth-of-type(3n) {
+ margin-right: 0;
+}
+.main_content .query_param .list .active {
+ color: var(--themeColor);
+ background: rgba(176, 135, 113, 0.08);
+}
+.main_content .query_param .btns {
+ display: flex;
+}
+.main_content .query_param .btns .btn {
+ flex: 1;
+ height: 88rpx;
+ background: #E5E5E5;
+ color: #666666;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.main_content .query_param .btns .sub {
+ background: var(--themeColor);
+ color: #fff;
+}
+.main_content .status {
+ display: flex;
+ padding: 0rpx 40rpx;
+ margin: 20rpx 0;
+ align-items: center;
+}
+.main_content .status .active {
+ color: var(--themeColor);
+}
+.main_content .status .separate {
+ margin: 0 12rpx;
+ width: 1rpx;
+ height: 28rpx;
+ background-color: #333333;
+}
+.main_content .goods_list {
+ padding: 12rpx 40rpx;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+}
+.main_content .goods_list .item {
+ width: 324rpx;
+ margin-bottom: 60rpx;
+}
+.main_content .goods_list .item .img_wrap {
+ width: 100%;
+ height: 182rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+}
+.main_content .goods_list .item .img_wrap .img {
+ width: 100%;
+ height: 100%;
+}
+.main_content .goods_list .item .img_wrap .tag {
+ padding: 0 10rpx;
+ height: 46rpx;
+ line-height: 46rpx;
+ text-align: center;
+ background: rgba(0, 0, 0, 0.4);
+ border-radius: 8rpx;
+ position: absolute;
+ left: 12rpx;
+ top: 16rpx;
+ color: #fff;
+ font-size: 24rpx;
+ z-index: 10;
+}
+.main_content .goods_list .item .name {
+ margin: 12rpx 0 8rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ flex: 1;
+}
+.main_content .goods_list .item .info {
+ display: flex;
+ align-items: center;
+ color: #666666;
+ margin-left: 12rpx;
+}
+.main_content .goods_list .item .info .icon {
+ width: 28rpx;
+ margin-right: 8rpx;
+}
+.main_content .goods_list .item .info .num {
+ margin-right: 28rpx;
+}
+.main_content .goods_list .item .info .primary {
+ color: var(--themeColor);
+}
diff --git a/wechat_jiaxuan/pages/consult/detail.less b/wechat_jiaxuan/pages/consult/detail.less
index a4b7e23..1556ec7 100644
--- a/wechat_jiaxuan/pages/consult/detail.less
+++ b/wechat_jiaxuan/pages/consult/detail.less
@@ -1,5 +1,5 @@
.main_content {
- padding: 40rpx 40rpx 100rpx;
+ padding: 40rpx 40rpx 160rpx;
.main_title {
font-weight: 500;
@@ -16,13 +16,18 @@
}
.footer {
- display: flex;
- align-items: center;
- height: 100rpx;
position: fixed;
bottom: 0;
- left: 40rpx;
- width: 670rpx;
+ left: 0;
+ width: 750rpx;
+ background-color: #fff;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+ .btns{
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ padding: 12rpx 40rpx;
+ }
.sub_btn {
display: flex;
justify-content: center;
diff --git a/wechat_jiaxuan/pages/consult/detail.wxml b/wechat_jiaxuan/pages/consult/detail.wxml
index c684ab4..d12b417 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxml
+++ b/wechat_jiaxuan/pages/consult/detail.wxml
@@ -9,18 +9,20 @@
</view>
</view>
<!-- footer -->
- <view class="footer" style="bottom: {{bottomLift}}px;">
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
- <view class="name">鏀惰棌</view>
- </view>
- <view class="item">
- <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
- <view class="name">鍒嗕韩</view>
- </view>
- <view class="sub_btn">
- <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
- <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view class="btns">
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <view class="name">鏀惰棌</view>
+ </view>
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </view>
+ <view class="sub_btn">
+ <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
+ <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ </view>
</view>
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/consult/detail.wxss b/wechat_jiaxuan/pages/consult/detail.wxss
index 2886370..ec44c9d 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxss
+++ b/wechat_jiaxuan/pages/consult/detail.wxss
@@ -1,5 +1,5 @@
.main_content {
- padding: 40rpx 40rpx 100rpx;
+ padding: 40rpx 40rpx 160rpx;
}
.main_content .main_title {
font-weight: 500;
@@ -13,13 +13,18 @@
color: #999999;
}
.footer {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ background-color: #fff;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+}
+.footer .btns {
display: flex;
align-items: center;
height: 100rpx;
- position: fixed;
- bottom: 0;
- left: 40rpx;
- width: 670rpx;
+ padding: 12rpx 40rpx;
}
.footer .sub_btn {
display: flex;
diff --git a/wechat_jiaxuan/pages/detailDis/case.js b/wechat_jiaxuan/pages/detailDis/case.js
new file mode 100644
index 0000000..8adf1e3
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/case.js
@@ -0,0 +1,69 @@
+// pages/detailDis/case.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ bottomLift: 0
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+ var app = getApp().globalData
+ this.setData({
+ bottomLift: app.bottomLift
+ })
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/case.json b/wechat_jiaxuan/pages/detailDis/case.json
new file mode 100644
index 0000000..69c292b
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/case.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "妗堜緥璇︽儏"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/case.less b/wechat_jiaxuan/pages/detailDis/case.less
new file mode 100644
index 0000000..e77c3dd
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/case.less
@@ -0,0 +1,103 @@
+.container {
+ padding: 0 40rpx 220rpx;
+
+ .main_title {
+ font-weight: 500;
+ font-size: 44rpx;
+ color: #222222;
+ margin: 32rpx 0;
+ }
+
+ .time {
+ font-size: 26rpx;
+ color: #999999;
+ margin-bottom: 48rpx;
+ }
+
+ .fullview_wrap {
+ .banner {
+ width: 100%;
+ border-radius: 8rpx;
+ }
+ }
+
+ .img {
+ width: 100%;
+ border-radius: 8rpx;
+ }
+
+ .h1 {
+ margin: 80rpx 0 48rpx;
+ font-weight: 600;
+ font-size: 36rpx;
+ }
+
+ .analysis {
+ background: #F7F7F7;
+ border-radius: 10rpx;
+ padding: 28rpx 30rpx;
+ margin-top: 66rpx;
+ .h2 {
+ font-weight: 500;
+ margin-bottom: 20rpx;
+ .text{
+ font-size: 26rpx;
+ font-weight: 300;
+ color: #333333;
+ }
+ }
+ }
+ .list{
+ .item{
+ .content{
+ font-weight: 300;
+ font-size: 28rpx;
+ color: #333333;
+ }
+ }
+ }
+
+}
+.footer {
+ position: fixed;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ padding: 0rpx 40rpx;
+ background-color: #fff;
+ .btns{
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ }
+ .sub_btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+ .sheji{
+ width: 28rpx;
+ margin-right: 8rpx;
+ }
+ }
+ .item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-size: 20rpx;
+ color: #666666;
+ margin-right: 48rpx;
+ .icon {
+ width: 44rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxml b/wechat_jiaxuan/pages/detailDis/case.wxml
new file mode 100644
index 0000000..67b4fbe
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/case.wxml
@@ -0,0 +1,48 @@
+<view class="container">
+ <view class="main_title">绠�娆ч鏍�70m虏涓ゅ眳瀹�</view>
+ <view class="time">鍙戝竷鏃堕棿锛�2021-08-21 10:0</view>
+ <view class="fullview_wrap">
+ <image class="banner" src="../../static/icon/test.png" mode="widthFix"></image>
+ </view>
+ <view class="h1">甯冪疆鍥�</view>
+ <image class="img" src="../../static/icon/test.png" mode="widthFix"></image>
+ <view class="analysis">
+ <view class="h2">妗堜緥瑙ｆ瀽</view>
+ <view class="text">涓轰繚鐣欏叆鎴风殑鍌ㄧ撼绌洪棿锛屽皢鍗敓闂寸殑闂ㄧЩ鍔ㄤ竴娈佃窛绂伙紝鏂逛究浜嗗叆鎴疯吹鐨勮缃紝鍌ㄧ墿闂村皝闂仛涓诲崸琛ｅ附闂达紝澧炲姞绌洪棿浣跨敤鐜囧拰鎴垮眿鏁翠綋鎬с�傚鍘呯殑鏍煎眬璁捐澧炲姞浜嗙┖闂寸殑灞傛鎰熴��</view>
+ </view>
+ <view class="list">
+ <view class="item">
+ <view class="h1">01.瀹㈠巺</view>
+ <image src="" mode="widthFix" />
+ <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+ </view>
+ <view class="item">
+ <view class="h1">01.瀹㈠巺</view>
+ <image src="" mode="widthFix" />
+ <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+ </view>
+ <view class="item">
+ <view class="h1">01.瀹㈠巺</view>
+ <image src="" mode="widthFix" />
+ <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+ </view>
+ </view>
+ <!-- footer -->
+ <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view class="btns">
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <view class="name">鏀惰棌</view>
+ </view>
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </view>
+ <view class="sub_btn">
+ <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
+ <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ </view>
+ </view>
+ </view>
+
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/case.wxss b/wechat_jiaxuan/pages/detailDis/case.wxss
new file mode 100644
index 0000000..837f098
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/case.wxss
@@ -0,0 +1,90 @@
+.container {
+ padding: 0 40rpx 220rpx;
+}
+.container .main_title {
+ font-weight: 500;
+ font-size: 44rpx;
+ color: #222222;
+ margin: 32rpx 0;
+}
+.container .time {
+ font-size: 26rpx;
+ color: #999999;
+ margin-bottom: 48rpx;
+}
+.container .fullview_wrap .banner {
+ width: 100%;
+ border-radius: 8rpx;
+}
+.container .img {
+ width: 100%;
+ border-radius: 8rpx;
+}
+.container .h1 {
+ margin: 80rpx 0 48rpx;
+ font-weight: 600;
+ font-size: 36rpx;
+}
+.container .analysis {
+ background: #F7F7F7;
+ border-radius: 10rpx;
+ padding: 28rpx 30rpx;
+ margin-top: 66rpx;
+}
+.container .analysis .h2 {
+ font-weight: 500;
+ margin-bottom: 20rpx;
+}
+.container .analysis .h2 .text {
+ font-size: 26rpx;
+ font-weight: 300;
+ color: #333333;
+}
+.container .list .item .content {
+ font-weight: 300;
+ font-size: 28rpx;
+ color: #333333;
+}
+.footer {
+ position: fixed;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ padding: 0rpx 40rpx;
+ background-color: #fff;
+}
+.footer .btns {
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+}
+.footer .sub_btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
+ border-radius: 8rpx;
+}
+.footer .sub_btn .sheji {
+ width: 28rpx;
+ margin-right: 8rpx;
+}
+.footer .item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-size: 20rpx;
+ color: #666666;
+ margin-right: 48rpx;
+}
+.footer .item .icon {
+ width: 44rpx;
+}
diff --git a/wechat_jiaxuan/pages/detailDis/product.js b/wechat_jiaxuan/pages/detailDis/product.js
new file mode 100644
index 0000000..8f0de89
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/product.js
@@ -0,0 +1,69 @@
+// pages/detailDis/product.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ bottomLift: 0
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+ var app = getApp().globalData
+ this.setData({
+ bottomLift: app.bottomLift
+ })
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/product.json b/wechat_jiaxuan/pages/detailDis/product.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/product.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/product.less b/wechat_jiaxuan/pages/detailDis/product.less
new file mode 100644
index 0000000..c088474
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/product.less
@@ -0,0 +1,200 @@
+.user {
+ width: 750rpx;
+ padding: 0 40rpx;
+ height: 148rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 0 30rpx;
+ display: flex;
+ align-items: center;
+
+ .content {
+ flex: 1;
+
+ .name {
+ font-size: 30rpx;
+ margin-bottom: 12rpx;
+ }
+
+ .desc {
+ font-size: 24rpx;
+ color: #999999;
+ }
+ }
+
+ .avatar {
+ width: 80rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+ }
+
+ .btn {
+ width: 118rpx;
+ height: 56rpx;
+ line-height: 52rpx;
+ text-align: center;
+ background: var(--themeColor);
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 26rpx;
+ color: #fff;
+ }
+}
+
+page {
+ background-color: #f7f7f7;
+}
+
+.main_content {
+ padding: 52rpx 40rpx 40rpx;
+ border-radius: 16rpx 16rpx 0rpx 0rpx;
+ background-color: #fff;
+ margin-bottom: 20rpx;
+
+ .title {
+ font-weight: 500;
+ font-size: 36rpx;
+ }
+
+ .desc {
+ font-size: 26rpx;
+ color: #555555;
+ margin: 16rpx 0 26rpx;
+ }
+
+ .text {
+ font-size: 26rpx;
+ color: #555555;
+ margin-bottom: 40rpx;
+ }
+}
+
+.counselor {
+ width: 670rpx;
+ padding: 0 0 0 30rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.2);
+
+ .content {
+ .name {
+ margin-bottom: 0;
+ }
+
+ .desc {
+ margin: 0;
+ }
+ }
+
+ .avatar_wrap {
+ width: 80rpx;
+ height: 80rpx;
+ background: rgba(176, 135, 113, 0.14);
+ border-radius: 50%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-right: 24rpx;
+
+ .avatar {
+ width: 52rpx;
+ margin: 0;
+ }
+ }
+
+ .btn {
+ width: 68rpx;
+ height: 100%;
+ font-size: 26rpx;
+ color: #FFFFFF;
+ font-weight: 400;
+ padding: 20rpx;
+ line-height: 34rpx;
+ border-radius: 0rpx 8rpx 8rpx 0rpx;
+ }
+}
+
+.video {
+ padding: 52rpx 40rpx 40rpx;
+ background-color: #fff;
+
+ .title {
+ font-weight: 600;
+ font-size: 36rpx;
+ margin-bottom: 32rpx;
+ }
+
+ video {
+ width: 100%;
+ border: 1px solid;
+ border-radius: 8rpx;
+ }
+}
+
+.detail {
+ padding: 52rpx 40rpx 40rpx;
+ background-color: #fff;
+
+ .title {
+ font-weight: 600;
+ font-size: 36rpx;
+ margin-bottom: 32rpx;
+ }
+
+ .line {
+ display: flex;
+ height: 62rpx;
+ margin-bottom: 24rpx;
+
+ .label {
+ font-size: 24rpx;
+ color: #666666;
+ }
+
+ .val {
+ font-size: 24rpx;
+ color: #333333;
+ }
+ }
+}
+.footer {
+ position: fixed;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ padding: 0rpx 40rpx;
+ background-color: #fff;
+ .btns{
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ }
+ .sub_btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+ .sheji{
+ width: 28rpx;
+ margin-right: 8rpx;
+ }
+ }
+ .item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-size: 20rpx;
+ color: #666666;
+ margin-right: 48rpx;
+ .icon {
+ width: 44rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxml b/wechat_jiaxuan/pages/detailDis/product.wxml
new file mode 100644
index 0000000..244cdce
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/product.wxml
@@ -0,0 +1,61 @@
+<view>
+ <view class="user">
+ <view class="avatar"></view>
+ <view class="content">
+ <view class="name">涓佹鏋�</view>
+ <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
+ </view>
+ <view class="btn">鑱旂郴TA</view>
+ </view>
+ <view class="main_content">
+ <view class="title">鑾タ鍋囨棩-椁愬巺</view>
+ <view class="desc">绠�娆ч鏍�</view>
+ <view class="text">瀹跺眳椋庢牸涓嶅浛浜庡浐鏈夊舰寮忥紝鍘ㄦ埧鍔熻兘涓嶅眬闄愪簬涓�鏃ヤ笁椁愩��
+ 鍏冪礌涓庢潗璐ㄧ鎾炲嚭鐨勪笉浠呮槸璁捐鎰燂紝鏇存槸涓�绉嶉矞鏄庣殑涓嶆嫎
+ 涓�鏍肩殑鐜颁唬鎬佸害锛岃瀺鍚堝綋涓嬫祦琛岀編瀛︼紝鏋勮绌洪棿鐨勬棤椋庢牸
+ 鍖栥��</view>
+ <view class="user counselor">
+ <view class="avatar_wrap">
+ <image class="avatar" mode="widthFix" src="../../static/icon/home_ic_guwen@2x.png"></image>
+ </view>
+ <view class="content">
+ <view class="name">鎮ㄧ殑涓撳睘瀹跺眳椤鹃棶</view>
+ <view class="desc">鎮ㄨ韩杈圭殑鍏ㄥ眿璁捐涓撳</view>
+ </view>
+ <view class="btn">鍘荤湅鐪�</view>
+ </view>
+ </view>
+ <!-- video -->
+ <view class="video">
+ <view class="title">浜у搧瑙嗛</view>
+ <video src=""></video>
+ </view>
+ <view class="detail">
+ <view class="title">浜у搧璇︽儏</view>
+ <view class="line">
+ <view class="label">鍝佸悕锛�</view>
+ <view class="val">鑾タ鍋囨棩-椁愬巺</view>
+ </view>
+ <view class="line">
+ <view class="label">宸ヨ壓锛�</view>
+ <view class="val">鑾タ鍋囨棩-椁愬巺</view>
+ </view>
+ </view>
+ <!-- footer -->
+ <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view class="btns">
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <view class="name">鏀惰棌</view>
+ </view>
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </view>
+ <view class="sub_btn">
+ <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
+ <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ </view>
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/product.wxss b/wechat_jiaxuan/pages/detailDis/product.wxss
new file mode 100644
index 0000000..6226e87
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/product.wxss
@@ -0,0 +1,174 @@
+.user {
+ width: 750rpx;
+ padding: 0 40rpx;
+ height: 148rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 0 30rpx;
+ display: flex;
+ align-items: center;
+}
+.user .content {
+ flex: 1;
+}
+.user .content .name {
+ font-size: 30rpx;
+ margin-bottom: 12rpx;
+}
+.user .content .desc {
+ font-size: 24rpx;
+ color: #999999;
+}
+.user .avatar {
+ width: 80rpx;
+ border-radius: 50%;
+ margin-right: 24rpx;
+}
+.user .btn {
+ width: 118rpx;
+ height: 56rpx;
+ line-height: 52rpx;
+ text-align: center;
+ background: var(--themeColor);
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 26rpx;
+ color: #fff;
+}
+page {
+ background-color: #f7f7f7;
+}
+.main_content {
+ padding: 52rpx 40rpx 40rpx;
+ border-radius: 16rpx 16rpx 0rpx 0rpx;
+ background-color: #fff;
+ margin-bottom: 20rpx;
+}
+.main_content .title {
+ font-weight: 500;
+ font-size: 36rpx;
+}
+.main_content .desc {
+ font-size: 26rpx;
+ color: #555555;
+ margin: 16rpx 0 26rpx;
+}
+.main_content .text {
+ font-size: 26rpx;
+ color: #555555;
+ margin-bottom: 40rpx;
+}
+.counselor {
+ width: 670rpx;
+ padding: 0 0 0 30rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.2);
+}
+.counselor .content .name {
+ margin-bottom: 0;
+}
+.counselor .content .desc {
+ margin: 0;
+}
+.counselor .avatar_wrap {
+ width: 80rpx;
+ height: 80rpx;
+ background: rgba(176, 135, 113, 0.14);
+ border-radius: 50%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-right: 24rpx;
+}
+.counselor .avatar_wrap .avatar {
+ width: 52rpx;
+ margin: 0;
+}
+.counselor .btn {
+ width: 68rpx;
+ height: 100%;
+ font-size: 26rpx;
+ color: #FFFFFF;
+ font-weight: 400;
+ padding: 20rpx;
+ line-height: 34rpx;
+ border-radius: 0rpx 8rpx 8rpx 0rpx;
+}
+.video {
+ padding: 52rpx 40rpx 40rpx;
+ background-color: #fff;
+}
+.video .title {
+ font-weight: 600;
+ font-size: 36rpx;
+ margin-bottom: 32rpx;
+}
+.video video {
+ width: 100%;
+ border: 1px solid;
+ border-radius: 8rpx;
+}
+.detail {
+ padding: 52rpx 40rpx 40rpx;
+ background-color: #fff;
+}
+.detail .title {
+ font-weight: 600;
+ font-size: 36rpx;
+ margin-bottom: 32rpx;
+}
+.detail .line {
+ display: flex;
+ height: 62rpx;
+ margin-bottom: 24rpx;
+}
+.detail .line .label {
+ font-size: 24rpx;
+ color: #666666;
+}
+.detail .line .val {
+ font-size: 24rpx;
+ color: #333333;
+}
+.footer {
+ position: fixed;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ padding: 0rpx 40rpx;
+ background-color: #fff;
+}
+.footer .btns {
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+}
+.footer .sub_btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
+ border-radius: 8rpx;
+}
+.footer .sub_btn .sheji {
+ width: 28rpx;
+ margin-right: 8rpx;
+}
+.footer .item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-size: 20rpx;
+ color: #666666;
+ margin-right: 48rpx;
+}
+.footer .item .icon {
+ width: 44rpx;
+}
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.js b/wechat_jiaxuan/pages/detailDis/realpic.js
new file mode 100644
index 0000000..6016c13
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/realpic.js
@@ -0,0 +1,69 @@
+// pages/detailDis/realpic.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ bottomLift: 0
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+ var app = getApp().globalData
+ this.setData({
+ bottomLift: app.bottomLift
+ })
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.json b/wechat_jiaxuan/pages/detailDis/realpic.json
new file mode 100644
index 0000000..d29e33b
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/realpic.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "瀹炴櫙璇︽儏"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.less b/wechat_jiaxuan/pages/detailDis/realpic.less
new file mode 100644
index 0000000..6a65d1b
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/realpic.less
@@ -0,0 +1,73 @@
+.container {
+ padding: 0 40rpx 220rpx;
+
+ .main_title {
+ font-weight: 500;
+ font-size: 44rpx;
+ color: #222222;
+ margin: 32rpx 0;
+ }
+
+ .time {
+ font-size: 26rpx;
+ color: #999999;
+ margin-bottom: 48rpx;
+ }
+ .img {
+ width: 100%;
+ border-radius: 8rpx;
+ }
+ .list{
+ .item{
+ .content{
+ font-weight: 300;
+ font-size: 28rpx;
+ color: #333333;
+ }
+ }
+ }
+
+}
+.footer {
+ position: fixed;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ padding: 0rpx 40rpx;
+ background-color: #fff;
+ .btns{
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+ }
+ .sub_btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.33);
+ border-radius: 8rpx;
+ .sheji{
+ width: 28rpx;
+ margin-right: 8rpx;
+ }
+ }
+ .item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-size: 20rpx;
+ color: #666666;
+ margin-right: 48rpx;
+ .icon {
+ width: 44rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxml b/wechat_jiaxuan/pages/detailDis/realpic.wxml
new file mode 100644
index 0000000..9938b5f
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxml
@@ -0,0 +1,36 @@
+<view class="container">
+ <view class="main_title">绠�娆ч鏍�70m虏涓ゅ眳瀹�</view>
+ <view class="time">鍙戝竷鏃堕棿锛�2021-08-21 10:0</view>
+ <view class="list">
+ <view class="item">
+ <image src="" mode="widthFix" />
+ <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+ </view>
+ <view class="item">
+ <image src="" mode="widthFix" />
+ <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+ </view>
+ <view class="item">
+ <image src="" mode="widthFix" />
+ <view class="content">鐪嬫儻浜嗘暣榻愬垝涓�鐨勭幓鐠冨悐鏌滐紝閲戣壊妗嗗瀷鐜婚棬鍚婃煖鍙堟槸涓嶄竴鏍风殑瀹＄編锛岃竟妗嗗井鏂滃垏鍏ワ紝宸﹀彸瀵圭О鍒嗗竷锛岀伅鍏夋槧琛笅锛岀編鍛崇粴涓藉濮�</view>
+ </view>
+ </view>
+ <!-- footer -->
+ <view class="footer" style="padding-bottom: {{bottomLift}}px;">
+ <view class="btns">
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <view class="name">鏀惰棌</view>
+ </view>
+ <view class="item">
+ <image class="icon" src="../../static/icon/detail_nav_share.png" mode="widthFix"></image>
+ <view class="name">鍒嗕韩</view>
+ </view>
+ <view class="sub_btn">
+ <image class="sheji" src="../../static/icon/ic_sheji.png" mode="widthFix"></image>
+ <view>鍏嶈垂棰勭害涓撳睘璁捐</view>
+ </view>
+ </view>
+ </view>
+
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/detailDis/realpic.wxss b/wechat_jiaxuan/pages/detailDis/realpic.wxss
new file mode 100644
index 0000000..9148934
--- /dev/null
+++ b/wechat_jiaxuan/pages/detailDis/realpic.wxss
@@ -0,0 +1,66 @@
+.container {
+ padding: 0 40rpx 220rpx;
+}
+.container .main_title {
+ font-weight: 500;
+ font-size: 44rpx;
+ color: #222222;
+ margin: 32rpx 0;
+}
+.container .time {
+ font-size: 26rpx;
+ color: #999999;
+ margin-bottom: 48rpx;
+}
+.container .img {
+ width: 100%;
+ border-radius: 8rpx;
+}
+.container .list .item .content {
+ font-weight: 300;
+ font-size: 28rpx;
+ color: #333333;
+}
+.footer {
+ position: fixed;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ padding: 0rpx 40rpx;
+ background-color: #fff;
+}
+.footer .btns {
+ display: flex;
+ align-items: center;
+ height: 100rpx;
+}
+.footer .sub_btn {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 72rpx;
+ flex: 1;
+ background-color: var(--themeColor);
+ font-weight: 500;
+ color: #FFFFFF;
+ font-style: 28rpx;
+ box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.33);
+ border-radius: 8rpx;
+}
+.footer .sub_btn .sheji {
+ width: 28rpx;
+ margin-right: 8rpx;
+}
+.footer .item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ font-size: 20rpx;
+ color: #666666;
+ margin-right: 48rpx;
+}
+.footer .item .icon {
+ width: 44rpx;
+}
diff --git a/wechat_jiaxuan/pages/discover/discover.json b/wechat_jiaxuan/pages/discover/discover.json
index aecbe3e..632ff7d 100644
--- a/wechat_jiaxuan/pages/discover/discover.json
+++ b/wechat_jiaxuan/pages/discover/discover.json
@@ -1,6 +1,8 @@
{
"usingComponents": {
- "disProduct": "../../components/disProduct"
+ "disProduct": "../../components/disProduct",
+ "disCase": "../../components/disCase",
+ "disRealpic": "../../components/disRealpic"
},
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
diff --git a/wechat_jiaxuan/pages/discover/discover.wxml b/wechat_jiaxuan/pages/discover/discover.wxml
index 352c4be..9a877da 100644
--- a/wechat_jiaxuan/pages/discover/discover.wxml
+++ b/wechat_jiaxuan/pages/discover/discover.wxml
@@ -17,5 +17,7 @@
<!-- -->
<view class="main_content" style="height: calc( 100vh - {{menuButtonInfo.top}}px - 88rpx )">
<disProduct wx:if="{{ activeTabs == '0' }}" />
+ <disCase wx:if="{{ activeTabs == '1' }}" />
+ <disRealpic wx:if="{{ activeTabs == '2' }}" />
</view>
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/mine/mine.js b/wechat_jiaxuan/pages/mine/mine.js
index b736413..b127705 100644
--- a/wechat_jiaxuan/pages/mine/mine.js
+++ b/wechat_jiaxuan/pages/mine/mine.js
@@ -5,16 +5,26 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
-
+ clientHeight: 0,
+ clientTop: 0,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
+ const res = wx.getMenuButtonBoundingClientRect()
+ this.setData({clientHeight: res.height})
+ this.setData({clientTop: res.top})
},
-
+ changePath(e) {
+ // 椤甸潰璺宠浆
+ let temp = ['mysub', 'collect', 'favorite', 'index']
+ const index = e.currentTarget.dataset.index
+ wx.navigateTo({
+ url: `/pages/userinfo/${temp[index]}`,
+ })
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
diff --git a/wechat_jiaxuan/pages/mine/mine.less b/wechat_jiaxuan/pages/mine/mine.less
new file mode 100644
index 0000000..a56e1d9
--- /dev/null
+++ b/wechat_jiaxuan/pages/mine/mine.less
@@ -0,0 +1,75 @@
+.container {
+ background-color: #aca9a6;
+
+ .navbar {
+ padding-left: 30rpx;
+ font-weight: 600;
+ font-size: 38rpx;
+ color: #FFFFFF;
+ }
+
+ .userinfo {
+ display: flex;
+ padding: 72rpx 40rpx 48rpx;
+ color: #fff;
+ font-size: 26rpx;
+
+ .content {
+ flex: 1;
+
+ .header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .name {
+ font-weight: 600;
+ font-size: 36rpx;
+ }
+
+ .edit {
+ width: 92rpx;
+ height: 52rpx;
+ line-height: 50rpx;
+ text-align: center;
+ border-radius: 32rpx;
+ border: 1rpx solid rgba(255, 255, 255, 0.5);
+ }
+ }
+
+ .addr {
+ margin: 10rpx 0 12rpx;
+ }
+ }
+
+ .avatar {
+ width: 112rpx;
+ height: 112rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.08);
+ border-radius: 50%;
+ border: 4rpx solid #FFFFFF;
+ margin-right: 30rpx;
+ }
+ }
+ .main_content{
+ background-color: #fff;
+ border-radius: 16rpx 16rpx 0rpx 0rpx;
+ padding: 40rpx;
+ .func_list{
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ margin-bottom: 40rpx;
+ .line{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 40rpx;
+ height: 108rpx;
+ .icon{
+ width: 40rpx;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/mine/mine.wxml b/wechat_jiaxuan/pages/mine/mine.wxml
index d236877..36c8460 100644
--- a/wechat_jiaxuan/pages/mine/mine.wxml
+++ b/wechat_jiaxuan/pages/mine/mine.wxml
@@ -1,2 +1,40 @@
-<!--pages/mine/mine.wxml-->
-<text>pages/mine/mine.wxml</text>
+<view class="container">
+ <view class="navbar" style="padding-top: {{ clientTop }}px;height: {{clientHeight + clientTop}}px;">鎴戠殑瀹�</view>
+ <view class="userinfo">
+ <image class="avatar" src=""></image>
+ <view class="content">
+ <view class="header">
+ <view class="name">鑻忕伩</view>
+ <view data-index="3" bindtap="changePath" class="edit">缂栬緫</view>
+ </view>
+ <view class="addr">鍚堣偉鑾茶姳灏忓尯</view>
+ <view class="detail">120m虏 锝�3瀹�1鍘�1鍘�1鍗�</view>
+ </view>
+ </view>
+ <view class="main_content">
+ <view class="func_list">
+ <view class="line" data-index="0" bindtap="changePath">
+ <view class="name">鎴戦绾︾殑</view>
+ <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
+ </view>
+ <view class="line" data-index="1" bindtap="changePath">
+ <view class="name">鎴戞敹钘忕殑</view>
+ <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
+ </view>
+ <view class="line" data-index="2" bindtap="changePath">
+ <view class="name">鎴戝枩娆㈢殑</view>
+ <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
+ </view>
+ </view>
+ <view class="func_list">
+ <view class="line">
+ <view class="name">鍛樺伐缁戝畾</view>
+ <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
+ </view>
+ <view class="line">
+ <view class="name">鏇村璁剧疆</view>
+ <image class="icon" src="../../static/icon/mine_ic_ar.png" mode="widthFix"></image>
+ </view>
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/mine/mine.wxss b/wechat_jiaxuan/pages/mine/mine.wxss
new file mode 100644
index 0000000..81c818c
--- /dev/null
+++ b/wechat_jiaxuan/pages/mine/mine.wxss
@@ -0,0 +1,67 @@
+.container {
+ background-color: #aca9a6;
+}
+.container .navbar {
+ padding-left: 30rpx;
+ font-weight: 600;
+ font-size: 38rpx;
+ color: #FFFFFF;
+}
+.container .userinfo {
+ display: flex;
+ padding: 72rpx 40rpx 48rpx;
+ color: #fff;
+ font-size: 26rpx;
+}
+.container .userinfo .content {
+ flex: 1;
+}
+.container .userinfo .content .header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.container .userinfo .content .header .name {
+ font-weight: 600;
+ font-size: 36rpx;
+}
+.container .userinfo .content .header .edit {
+ width: 92rpx;
+ height: 52rpx;
+ line-height: 50rpx;
+ text-align: center;
+ border-radius: 32rpx;
+ border: 1rpx solid rgba(255, 255, 255, 0.5);
+}
+.container .userinfo .content .addr {
+ margin: 10rpx 0 12rpx;
+}
+.container .userinfo .avatar {
+ width: 112rpx;
+ height: 112rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.08);
+ border-radius: 50%;
+ border: 4rpx solid #FFFFFF;
+ margin-right: 30rpx;
+}
+.container .main_content {
+ background-color: #fff;
+ border-radius: 16rpx 16rpx 0rpx 0rpx;
+ padding: 40rpx;
+}
+.container .main_content .func_list {
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ margin-bottom: 40rpx;
+}
+.container .main_content .func_list .line {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 40rpx;
+ height: 108rpx;
+}
+.container .main_content .func_list .line .icon {
+ width: 40rpx;
+}
diff --git a/wechat_jiaxuan/pages/sets/index.js b/wechat_jiaxuan/pages/sets/index.js
new file mode 100644
index 0000000..8a59b32
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/index.js
@@ -0,0 +1,77 @@
+// pages/sets/index.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ show: false
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+ showLogout() {
+ this.setData({show: true})
+ },
+ onClose() {
+ this.setData({show: false})
+ },
+ changeDeal(){
+ wx.navigateTo({
+ url: '/pages/sets/protocol',
+ })
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/index.json b/wechat_jiaxuan/pages/sets/index.json
new file mode 100644
index 0000000..e9930d1
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/index.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "van-popup": "@vant/weapp/popup/index"
+ },
+ "navigationBarTitleText": "璁剧疆"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/index.less b/wechat_jiaxuan/pages/sets/index.less
new file mode 100644
index 0000000..c60da15
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/index.less
@@ -0,0 +1,55 @@
+.list{
+ padding: 12rpx 32rpx;
+ .line{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 100rpx;
+ border-bottom: 2rpx solid #E5E5E5;
+ .name{
+ font-size: 30rpx;
+ }
+ .icon{
+ width: 40rpx;
+ }
+ }
+}
+.modal{
+ width: 610rpx;
+ height: 450rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 60rpx 40rpx 30rpx;
+ .title{
+ font-weight: 500;
+ font-size: 36rpx;
+ color: #222222;
+ margin-bottom: 30rpx;
+ }
+ .text{
+ color: #555555;
+ margin-bottom: 30rpx;
+ padding-bottom: 40rpx;
+ border-bottom: 2rpx solid #E5E5E5;
+ }
+ .btns{
+ display: flex;
+ justify-content: space-between;
+ .btn{
+ width: 254rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 30rpx;
+ color: #555555;
+ }
+ .cancel{
+ color: #fff;
+ background-color: var(--themeColor);
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/index.wxml b/wechat_jiaxuan/pages/sets/index.wxml
new file mode 100644
index 0000000..fd20e0c
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/index.wxml
@@ -0,0 +1,27 @@
+<view class="container">
+ <view class="list">
+ <view class="line" bindtap="changeDeal">
+ <view class="name">銆奪BOM鐢ㄦ埛鏈嶅姟鍗忚銆�</view>
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="line" bindtap="changeDeal">
+ <view class="name">銆奪BOM鐢ㄦ埛闅愮鍗忚銆�</view>
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="line" bindtap="showLogout">
+ <view class="name">娉ㄩ攢璐﹀彿</view>
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ </view>
+ </view>
+ <!-- -->
+ <van-popup show="{{ show }}" bind:close="onClose">
+ <view class="modal">
+ <view class="title">娉ㄩ攢鎻愰啋</view>
+ <view class="text">濡傛偍涓嶅啀浣跨敤姝よ处鍙凤紝鍙互灏嗗叾娉ㄩ攢銆傝处鍙锋垚鍔熸敞閿�鍚庯紝鍏朵笅鎵�鏈夋暟鎹皢浼氳鍒犻櫎骞跺皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔</view>
+ <view class="btns">
+ <view class="btn">纭娉ㄩ攢</view>
+ <view class="btn cancel" bindtap="onClose">杩樻槸绠椾簡</view>
+ </view>
+ </view>
+ </van-popup>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/index.wxss b/wechat_jiaxuan/pages/sets/index.wxss
new file mode 100644
index 0000000..d59ed0d
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/index.wxss
@@ -0,0 +1,55 @@
+.list {
+ padding: 12rpx 32rpx;
+}
+.list .line {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 100rpx;
+ border-bottom: 2rpx solid #E5E5E5;
+}
+.list .line .name {
+ font-size: 30rpx;
+}
+.list .line .icon {
+ width: 40rpx;
+}
+.modal {
+ width: 610rpx;
+ height: 450rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 60rpx 40rpx 30rpx;
+}
+.modal .title {
+ font-weight: 500;
+ font-size: 36rpx;
+ color: #222222;
+ margin-bottom: 30rpx;
+}
+.modal .text {
+ color: #555555;
+ margin-bottom: 30rpx;
+ padding-bottom: 40rpx;
+ border-bottom: 2rpx solid #E5E5E5;
+}
+.modal .btns {
+ display: flex;
+ justify-content: space-between;
+}
+.modal .btns .btn {
+ width: 254rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #F7F7F7;
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 30rpx;
+ color: #555555;
+}
+.modal .btns .cancel {
+ color: #fff;
+ background-color: var(--themeColor);
+}
diff --git a/wechat_jiaxuan/pages/sets/protocol.js b/wechat_jiaxuan/pages/sets/protocol.js
new file mode 100644
index 0000000..b731e2f
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/protocol.js
@@ -0,0 +1,66 @@
+// pages/sets/protocol.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/protocol.json b/wechat_jiaxuan/pages/sets/protocol.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/protocol.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/protocol.wxml b/wechat_jiaxuan/pages/sets/protocol.wxml
new file mode 100644
index 0000000..dc09cdd
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/protocol.wxml
@@ -0,0 +1,2 @@
+<!--pages/sets/protocol.wxml-->
+<text>pages/sets/protocol.wxml</text>
diff --git a/wechat_jiaxuan/pages/sets/protocol.wxss b/wechat_jiaxuan/pages/sets/protocol.wxss
new file mode 100644
index 0000000..30e4241
--- /dev/null
+++ b/wechat_jiaxuan/pages/sets/protocol.wxss
@@ -0,0 +1 @@
+/* pages/sets/protocol.wxss */
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/collect.js b/wechat_jiaxuan/pages/userinfo/collect.js
new file mode 100644
index 0000000..633951c
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/collect.js
@@ -0,0 +1,72 @@
+// pages/userinfo/collect.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ activeTabs: '0'
+ },
+
+ tabsChange(e) {
+ const activeTabs = e.currentTarget.dataset.val
+ this.setData({ activeTabs })
+ },
+ handleDetail(e) {
+ wx.navigateTo({
+ url: '/pages/detailDis/product',
+ })
+ },
+ onLoad(options) {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/collect.json b/wechat_jiaxuan/pages/userinfo/collect.json
new file mode 100644
index 0000000..8fd3e9f
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/collect.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "鎴戞敹钘忕殑"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/collect.less b/wechat_jiaxuan/pages/userinfo/collect.less
new file mode 100644
index 0000000..f2d4f55
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/collect.less
@@ -0,0 +1,80 @@
+
+.tabs{
+ background-color: #fff;
+ padding: 0 40rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ .item{
+ font-size: 30rpx;
+ color: #666666;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ .border{
+ width: 40rpx;
+ height: 6rpx;
+ background-color: #fff;
+ margin-top: 16rpx;
+ border-radius: 3rpx;
+ }
+ }
+ .active{
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+ .border{
+ background: #F4CA1C;
+ }
+ }
+}
+.list{
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ padding: 40rpx;
+ width: 100%;
+ .item{
+ flex-shrink: 0;
+ margin-bottom: 60rpx;
+ width: 324rpx;
+ .img_wrap{
+ width: 324rpx;
+ height: 182rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+ .img{
+ width: 100%;
+ height: 100%;
+ }
+ .new{
+ width: 72rpx;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 10;
+ }
+ }
+ .name{
+ margin: 26rpx 0 14rpx;
+ }
+ .info{
+ display: flex;
+ align-items: center;
+ color: #666666;
+ .icon{
+ width: 28rpx;
+ margin-right: 8rpx;
+ }
+ .num{
+ margin-right: 16rpx;
+ }
+ .primary{
+ color: var(--themeColor);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/collect.wxml b/wechat_jiaxuan/pages/userinfo/collect.wxml
new file mode 100644
index 0000000..bbce2ec
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/collect.wxml
@@ -0,0 +1,60 @@
+<view class="container">
+ <view class="tabs">
+ <view class="item {{ activeTabs == '0' ? 'active' : '' }}" data-val="0" bindtap="tabsChange">
+ <view class="name">浜у搧</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-val="1" bindtap="tabsChange">
+ <view class="name">妗堜緥</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ activeTabs == '2' ? 'active' : '' }}" data-val="2" bindtap="tabsChange">
+ <view class="name">瀹炴櫙</view>
+ <view class="border"></view>
+ </view>
+ </view>
+ <view class="list">
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="name">閽㈢惔鏇�</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="name">閽㈢惔鏇�</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="name">閽㈢惔鏇�</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/collect.wxss b/wechat_jiaxuan/pages/userinfo/collect.wxss
new file mode 100644
index 0000000..8799200
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/collect.wxss
@@ -0,0 +1,79 @@
+.tabs {
+ background-color: #fff;
+ padding: 0 40rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+}
+.tabs .item {
+ font-size: 30rpx;
+ color: #666666;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+.tabs .item .border {
+ width: 40rpx;
+ height: 6rpx;
+ background-color: #fff;
+ margin-top: 16rpx;
+ border-radius: 3rpx;
+}
+.tabs .active {
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+}
+.tabs .active .border {
+ background: #F4CA1C;
+}
+.list {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ padding: 40rpx;
+ width: 100%;
+}
+.list .item {
+ flex-shrink: 0;
+ margin-bottom: 60rpx;
+ width: 324rpx;
+}
+.list .item .img_wrap {
+ width: 324rpx;
+ height: 182rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+}
+.list .item .img_wrap .img {
+ width: 100%;
+ height: 100%;
+}
+.list .item .img_wrap .new {
+ width: 72rpx;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 10;
+}
+.list .item .name {
+ margin: 26rpx 0 14rpx;
+}
+.list .item .info {
+ display: flex;
+ align-items: center;
+ color: #666666;
+}
+.list .item .info .icon {
+ width: 28rpx;
+ margin-right: 8rpx;
+}
+.list .item .info .num {
+ margin-right: 16rpx;
+}
+.list .item .info .primary {
+ color: var(--themeColor);
+}
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.js b/wechat_jiaxuan/pages/userinfo/favorite.js
new file mode 100644
index 0000000..633951c
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/favorite.js
@@ -0,0 +1,72 @@
+// pages/userinfo/collect.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ activeTabs: '0'
+ },
+
+ tabsChange(e) {
+ const activeTabs = e.currentTarget.dataset.val
+ this.setData({ activeTabs })
+ },
+ handleDetail(e) {
+ wx.navigateTo({
+ url: '/pages/detailDis/product',
+ })
+ },
+ onLoad(options) {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.json b/wechat_jiaxuan/pages/userinfo/favorite.json
new file mode 100644
index 0000000..484bcff
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/favorite.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "鎴戝枩娆㈢殑"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.less b/wechat_jiaxuan/pages/userinfo/favorite.less
new file mode 100644
index 0000000..bdc4a93
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/favorite.less
@@ -0,0 +1,80 @@
+/* pages/userinfo/favorite.wxss */
+.tabs{
+ background-color: #fff;
+ padding: 0 40rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ .item{
+ font-size: 30rpx;
+ color: #666666;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ .border{
+ width: 40rpx;
+ height: 6rpx;
+ background-color: #fff;
+ margin-top: 16rpx;
+ border-radius: 3rpx;
+ }
+ }
+ .active{
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+ .border{
+ background: #F4CA1C;
+ }
+ }
+}
+.list{
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ padding: 40rpx;
+ width: 100%;
+ .item{
+ flex-shrink: 0;
+ margin-bottom: 60rpx;
+ width: 324rpx;
+ .img_wrap{
+ width: 324rpx;
+ height: 182rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+ .img{
+ width: 100%;
+ height: 100%;
+ }
+ .new{
+ width: 72rpx;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 10;
+ }
+ }
+ .name{
+ margin: 26rpx 0 14rpx;
+ }
+ .info{
+ display: flex;
+ align-items: center;
+ color: #666666;
+ .icon{
+ width: 28rpx;
+ margin-right: 8rpx;
+ }
+ .num{
+ margin-right: 16rpx;
+ }
+ .primary{
+ color: var(--themeColor);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.wxml b/wechat_jiaxuan/pages/userinfo/favorite.wxml
new file mode 100644
index 0000000..bbce2ec
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/favorite.wxml
@@ -0,0 +1,60 @@
+<view class="container">
+ <view class="tabs">
+ <view class="item {{ activeTabs == '0' ? 'active' : '' }}" data-val="0" bindtap="tabsChange">
+ <view class="name">浜у搧</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-val="1" bindtap="tabsChange">
+ <view class="name">妗堜緥</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ activeTabs == '2' ? 'active' : '' }}" data-val="2" bindtap="tabsChange">
+ <view class="name">瀹炴櫙</view>
+ <view class="border"></view>
+ </view>
+ </view>
+ <view class="list">
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="name">閽㈢惔鏇�</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="name">閽㈢惔鏇�</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ <view class="item" bindtap="handleDetail">
+ <view class="img_wrap">
+ <image src="../../static/icon/test.png" class="img"></image>
+ <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="name">閽㈢惔鏇�</view>
+ <view class="info">
+ <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+ <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+ <text class="num {{true ? 'primary' : ''}}">34</text>
+ <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+ <text>1000</text>
+ </view>
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/favorite.wxss b/wechat_jiaxuan/pages/userinfo/favorite.wxss
new file mode 100644
index 0000000..7175240
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/favorite.wxss
@@ -0,0 +1,80 @@
+/* pages/userinfo/favorite.wxss */
+.tabs {
+ background-color: #fff;
+ padding: 0 40rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+}
+.tabs .item {
+ font-size: 30rpx;
+ color: #666666;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+.tabs .item .border {
+ width: 40rpx;
+ height: 6rpx;
+ background-color: #fff;
+ margin-top: 16rpx;
+ border-radius: 3rpx;
+}
+.tabs .active {
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+}
+.tabs .active .border {
+ background: #F4CA1C;
+}
+.list {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ padding: 40rpx;
+ width: 100%;
+}
+.list .item {
+ flex-shrink: 0;
+ margin-bottom: 60rpx;
+ width: 324rpx;
+}
+.list .item .img_wrap {
+ width: 324rpx;
+ height: 182rpx;
+ border-radius: 8rpx;
+ overflow: hidden;
+ position: relative;
+}
+.list .item .img_wrap .img {
+ width: 100%;
+ height: 100%;
+}
+.list .item .img_wrap .new {
+ width: 72rpx;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 10;
+}
+.list .item .name {
+ margin: 26rpx 0 14rpx;
+}
+.list .item .info {
+ display: flex;
+ align-items: center;
+ color: #666666;
+}
+.list .item .info .icon {
+ width: 28rpx;
+ margin-right: 8rpx;
+}
+.list .item .info .num {
+ margin-right: 16rpx;
+}
+.list .item .info .primary {
+ color: var(--themeColor);
+}
diff --git a/wechat_jiaxuan/pages/userinfo/index.js b/wechat_jiaxuan/pages/userinfo/index.js
new file mode 100644
index 0000000..2401160
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/index.js
@@ -0,0 +1,93 @@
+// pages/userinfo/index.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ name: "",
+ // 鍩庡競銆傚湴鍧�
+ region: [],
+ address: ''
+ },
+ onLoad(options) {
+
+ },
+ onSubmit() {
+
+ },
+ changeAddr() {
+ console.log('鐐瑰嚮浜�');
+ wx.chooseLocation({
+ type: 'wgs84',
+ success: (res) => {
+ console.log('res', res);
+ }
+ })
+ },
+ bindRegionChange(e) {
+ console.log('picker鍙戦�侀�夋嫨鏀瑰彉锛屾惡甯﹀�间负', e.detail.value)
+ this.setData({
+ region: e.detail.value
+ })
+ },
+ selMedia() {
+ console.log('dianjile');
+ wx.chooseMedia({
+ count: 1,
+ mediaType: ['image'],
+ sourceType: ['album', 'camera'],
+ maxDuration: 16,
+ camera: 'back',
+ success(res) {
+ console.log(res.tempFiles[0].tempFilePath)
+ console.log(res.tempFiles[0].size)
+ }
+ })
+ },
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/index.json b/wechat_jiaxuan/pages/userinfo/index.json
new file mode 100644
index 0000000..ffc0df9
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/index.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "van-field": "@vant/weapp/field/index"
+ },
+ "navigationBarTitleText": "涓汉璧勬枡"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/index.less b/wechat_jiaxuan/pages/userinfo/index.less
new file mode 100644
index 0000000..1f32fbe
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/index.less
@@ -0,0 +1,62 @@
+.avatar{
+ margin: 52rpx auto 40rpx;
+ width: 160rpx;
+ height: 160rpx;
+ border-radius: 50%;
+ box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0,0,0,0.08);
+ border: 4rpx solid #FFFFFF;
+ border: 1px solid;
+}
+.avatar_btn{
+ width: 168rpx;
+ height: 60rpx;
+ margin: 0 auto 40rpx;
+ line-height: 58rpx;
+ text-align: center;
+ border-radius: 30rpx;
+ border: 1rpx solid #CDA38D;
+ font-size: 26rpx;
+ color: var(--themeColor);
+}
+.list{
+ padding: 0 40rpx;
+ .line{
+ height: 78rpx;
+ margin-bottom: 40rpx;
+ display: flex;
+ align-items: center;
+ .label{
+ width: 110rpx;
+ font-size: 30rpx;
+ color: #777777;
+ }
+ .input{
+ flex: 1;
+ color: #111111;
+ }
+ .icon{
+ width: 40rpx;
+ }
+ }
+ .val{
+ flex: 1;
+ height: 78rpx;
+ padding-left: 32rpx;
+ border-bottom: 1rpx solid #f7f7f7;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .save{
+ color: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 670rpx;
+ height: 88rpx;
+ background: var(--themeColor);
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxml b/wechat_jiaxuan/pages/userinfo/index.wxml
new file mode 100644
index 0000000..446933c
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/index.wxml
@@ -0,0 +1,52 @@
+<view class="container">
+ <image class="avatar" src="" mode="widthFix"></image>
+ <view bindtap="selMedia" class="avatar_btn">鏇存崲澶村儚</view>
+ <view class="list">
+ <view class="line">
+ <view class="label">鏄电О</view>
+ <van-field type="text" class="input" model:value="{{ name }}" maxlength="{{ 18 }}" clearable />
+ </view>
+ <view class="line">
+ <view class="label">濮撳悕</view>
+ <van-field type="text" class="input" model:value="{{ name }}" maxlength="{{ 18 }}" clearable />
+ </view>
+ <view class="line">
+ <view class="label">鐢佃瘽</view>
+ <van-field type="number" class="input" model:value="{{ name }}" maxlength="{{ 11 }}" clearable />
+ </view>
+ <view class="line">
+ <view class="label">鍩庡競</view>
+ <view class="val">
+ <view class="input">
+ <picker mode="region" bindchange="bindRegionChange" value="{{region}}">
+ <view class="picker {{ region.length > 0 ? '' : 'placeholder9' }}">
+ {{ region.length == 0 ? '閫夋嫨鍩庡競' : '' }}{{region[0]}}{{region[1]}}{{region[2]}}
+ </view>
+ </picker>
+ </view>
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ </view>
+ </view>
+ <view class="line">
+ <view class="label">鍦板潃</view>
+ <view class="val" bindtap="changeAddr">
+ <view class="input">{{ address }}</view>
+ <image class="icon" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+ </view>
+ </view>
+ <view class="line">
+ <view class="label">灏忓尯</view>
+ <van-field type="text" class="input" model:value="{{ name }}" maxlength="{{ 15 }}" clearable />
+ </view>
+ <view class="line">
+ <view class="label">闈㈢Н</view>
+ <van-field type="text" class="input" model:value="{{ name }}" maxlength="{{ 15 }}" clearable />
+ </view>
+ <view class="line">
+ <view class="label">鎴峰瀷</view>
+ <van-field type="text" class="input" model:value="{{ name }}" maxlength="{{ 15 }}" clearable />
+ </view>
+ <view bindtap="onSubmit" class="save">淇濆瓨</view>
+ </view>
+ <!-- -->
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/index.wxss b/wechat_jiaxuan/pages/userinfo/index.wxss
new file mode 100644
index 0000000..7e4b111
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/index.wxss
@@ -0,0 +1,62 @@
+.avatar {
+ margin: 52rpx auto 40rpx;
+ width: 160rpx;
+ height: 160rpx;
+ border-radius: 50%;
+ box-shadow: 0rpx 2rpx 12rpx 0rpx rgba(0, 0, 0, 0.08);
+ border: 4rpx solid #FFFFFF;
+ border: 1px solid;
+}
+.avatar_btn {
+ width: 168rpx;
+ height: 60rpx;
+ margin: 0 auto 40rpx;
+ line-height: 58rpx;
+ text-align: center;
+ border-radius: 30rpx;
+ border: 1rpx solid #CDA38D;
+ font-size: 26rpx;
+ color: var(--themeColor);
+}
+.list {
+ padding: 0 40rpx;
+}
+.list .line {
+ height: 78rpx;
+ margin-bottom: 40rpx;
+ display: flex;
+ align-items: center;
+}
+.list .line .label {
+ width: 110rpx;
+ font-size: 30rpx;
+ color: #777777;
+}
+.list .line .input {
+ flex: 1;
+ color: #111111;
+}
+.list .line .icon {
+ width: 40rpx;
+}
+.list .val {
+ flex: 1;
+ height: 78rpx;
+ padding-left: 32rpx;
+ border-bottom: 1rpx solid #f7f7f7;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.list .save {
+ color: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 670rpx;
+ height: 88rpx;
+ background: var(--themeColor);
+ border-radius: 8rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+}
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.js b/wechat_jiaxuan/pages/userinfo/mysub.js
new file mode 100644
index 0000000..881c772
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/mysub.js
@@ -0,0 +1,70 @@
+// pages/userinfo/mysub.js
+Page({
+
+ /**
+ * 椤甸潰鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ activeTabs: '0'
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+ */
+ onLoad(options) {
+
+ },
+ tabsChange(e) {
+ const activeTabs = e.currentTarget.dataset.val
+ this.setData({ activeTabs })
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.json b/wechat_jiaxuan/pages/userinfo/mysub.json
new file mode 100644
index 0000000..82e93f8
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/mysub.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationBarTitleText": "鎴戠殑棰勭害"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.less b/wechat_jiaxuan/pages/userinfo/mysub.less
new file mode 100644
index 0000000..a3c8c93
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/mysub.less
@@ -0,0 +1,78 @@
+.container{
+ background-color: #f7f7f7;
+}
+.tabs{
+ background-color: #fff;
+ padding: 0 40rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ .item{
+ font-size: 30rpx;
+ color: #666666;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ .border{
+ width: 40rpx;
+ height: 6rpx;
+ background-color: #fff;
+ margin-top: 16rpx;
+ border-radius: 3rpx;
+ }
+ }
+ .active{
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+ .border{
+ background: #F4CA1C;
+ }
+ }
+}
+.list{
+ padding: 30rpx 40rpx;
+ .item{
+ width: 670rpx;
+ background: linear-gradient( 180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%);
+ border-radius: 8rpx;
+ padding: 30rpx;
+ margin-bottom: 30rpx;
+ .header{
+ font-size: 26rpx;
+ display: flex;
+ align-items: center;
+ margin-bottom: 30rpx;
+ .name{
+ font-weight: 500;
+ font-size: 32rpx;
+ margin-right: 18rpx;
+ }
+ }
+ .line{
+ display: flex;
+ align-items: center;
+ min-height: 40rpx;
+ margin-bottom: 20rpx;
+ .label{
+ color: #666666;
+ width: 140rpx;
+ font-size: 28rpx;
+ }
+ .spe{
+ letter-spacing: 56rpx;
+ }
+ .val{
+ color: #333333;
+ }
+ }
+ .time{
+ display: flex;
+ color: #999999;
+ font-size: 24rpx;
+ margin-top: 0rpx;
+ }
+ }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.wxml b/wechat_jiaxuan/pages/userinfo/mysub.wxml
new file mode 100644
index 0000000..1ddedff
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/mysub.wxml
@@ -0,0 +1,110 @@
+<view class="container">
+ <view class="tabs">
+ <view class="item {{ activeTabs == '0' ? 'active' : '' }}" data-val="0" bindtap="tabsChange">
+ <view class="name">闇�姹�</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-val="1" bindtap="tabsChange">
+ <view class="name">棰勭害閲忓昂</view>
+ <view class="border"></view>
+ </view>
+ <view class="item {{ activeTabs == '2' ? 'active' : '' }}" data-val="2" bindtap="tabsChange">
+ <view class="name">棰勭畻</view>
+ <view class="border"></view>
+ </view>
+ </view>
+ <view class="list">
+ <view class="item">
+ <view class="header">
+ <view class="name">name</view>
+ <view class="phone">198898</view>
+ </view>
+ <block wx:if="{{ false }}">
+ <view class="line">
+ <view class="label"><text class="spe">鎬�</text>鍒�</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label"><text class="spe">骞�</text>榫�</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎵�鍦ㄥ煄甯�</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎴峰瀷淇℃伅</view>
+ <view class="val">鐢�</view>
+ </view>
+ </block>
+ <!-- 棰勭畻 -->
+ <block wx:if="{{ true }}">
+ <view class="line">
+ <view class="label">鎴垮眿绫诲瀷</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎴峰瀷淇℃伅</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎴垮眿闈㈢Н</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">瑁呬慨棰勭畻</view>
+ <view class="val">鐢�</view>
+ </view>
+ </block>
+ <view class="time">
+ <view>鎻愪氦鏃堕棿锛�123213</view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="header">
+ <view class="name">name</view>
+ <view class="phone">198898</view>
+ </view>
+ <block wx:if="{{ false }}">
+ <view class="line">
+ <view class="label"><text class="spe">鎬�</text>鍒�</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label"><text class="spe">骞�</text>榫�</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎵�鍦ㄥ煄甯�</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎴峰瀷淇℃伅</view>
+ <view class="val">鐢�</view>
+ </view>
+ </block>
+ <!-- 棰勭畻 -->
+ <block wx:if="{{ true }}">
+ <view class="line">
+ <view class="label">鎴垮眿绫诲瀷</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎴峰瀷淇℃伅</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">鎴垮眿闈㈢Н</view>
+ <view class="val">鐢�</view>
+ </view>
+ <view class="line">
+ <view class="label">瑁呬慨棰勭畻</view>
+ <view class="val">鐢�</view>
+ </view>
+ </block>
+ <view class="time">
+ <view>鎻愪氦鏃堕棿锛�123213</view>
+ </view>
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/userinfo/mysub.wxss b/wechat_jiaxuan/pages/userinfo/mysub.wxss
new file mode 100644
index 0000000..d1fa552
--- /dev/null
+++ b/wechat_jiaxuan/pages/userinfo/mysub.wxss
@@ -0,0 +1,78 @@
+.container {
+ background-color: #f7f7f7;
+}
+.tabs {
+ background-color: #fff;
+ padding: 0 40rpx;
+ height: 88rpx;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+}
+.tabs .item {
+ font-size: 30rpx;
+ color: #666666;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+.tabs .item .border {
+ width: 40rpx;
+ height: 6rpx;
+ background-color: #fff;
+ margin-top: 16rpx;
+ border-radius: 3rpx;
+}
+.tabs .active {
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #222222;
+}
+.tabs .active .border {
+ background: #F4CA1C;
+}
+.list {
+ padding: 30rpx 40rpx;
+}
+.list .item {
+ width: 670rpx;
+ background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%);
+ border-radius: 8rpx;
+ padding: 30rpx;
+ margin-bottom: 30rpx;
+}
+.list .item .header {
+ font-size: 26rpx;
+ display: flex;
+ align-items: center;
+ margin-bottom: 30rpx;
+}
+.list .item .header .name {
+ font-weight: 500;
+ font-size: 32rpx;
+ margin-right: 18rpx;
+}
+.list .item .line {
+ display: flex;
+ align-items: center;
+ min-height: 40rpx;
+ margin-bottom: 20rpx;
+}
+.list .item .line .label {
+ color: #666666;
+ width: 140rpx;
+ font-size: 28rpx;
+}
+.list .item .line .spe {
+ letter-spacing: 56rpx;
+}
+.list .item .line .val {
+ color: #333333;
+}
+.list .item .time {
+ display: flex;
+ color: #999999;
+ font-size: 24rpx;
+ margin-top: 0rpx;
+}
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index 8b968e7..f716835 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -1,16 +1,17 @@
{
"projectname": "wechat_jiaxuan",
"setting": {
- "compileHotReLoad": true
+ "compileHotReLoad": true,
+ "urlCheck": false
},
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "libVersion": "3.4.9",
+ "libVersion": "2.22.1",
"condition": {
"miniprogram": {
"list": [
{
"name": "",
- "pathName": "pages/discover/discover",
+ "pathName": "pages/index/index",
"query": "",
"launchMode": "default",
"scene": null
@@ -31,21 +32,14 @@
},
{
"name": "",
- "pathName": "pages/consult/detail",
+ "pathName": "pages/mine/mine",
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "",
- "pathName": "pages/store/store",
- "query": "",
- "launchMode": "default",
- "scene": null
- },
- {
- "name": "",
- "pathName": "pages/store/info",
+ "pathName": "pages/sets/index",
"query": "",
"launchMode": "default",
"scene": null
diff --git a/wechat_jiaxuan/static/icon/mine_ic_ar.png b/wechat_jiaxuan/static/icon/mine_ic_ar.png
new file mode 100644
index 0000000..b749235
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mine_ic_ar.png
Binary files differ
--
Gitblit v1.9.3