静态界面80%
This commit is contained in:
parent
eceb170ece
commit
4322624605
1987
package-lock.json
generated
1987
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -37,6 +37,7 @@
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.7.7",
|
||||
"@tarojs/components": "3.3.10",
|
||||
"@tarojs/plugin-framework-react": "^3.4.11",
|
||||
"@tarojs/react": "3.3.10",
|
||||
"@tarojs/runtime": "3.3.10",
|
||||
"@tarojs/taro": "3.3.10",
|
||||
|
@ -1,13 +1,47 @@
|
||||
{
|
||||
"miniprogramRoot": "./dist",
|
||||
"miniprogramRoot": "dist/",
|
||||
"projectname": "EShop",
|
||||
"description": "电子商城",
|
||||
"description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
|
||||
"appid": "wx68d92d7cbf0b6963",
|
||||
"setting": {
|
||||
"urlCheck": true,
|
||||
"es6": false,
|
||||
"postcss": false,
|
||||
"minified": false
|
||||
"minified": false,
|
||||
"coverView": true,
|
||||
"lazyloadPlaceholderEnable": false,
|
||||
"preloadBackgroundData": false,
|
||||
"autoAudits": false,
|
||||
"uglifyFileName": false,
|
||||
"uploadWithSourceMap": true,
|
||||
"enhance": true,
|
||||
"useMultiFrameRuntime": true,
|
||||
"showShadowRootInWxmlPanel": true,
|
||||
"packNpmManually": false,
|
||||
"packNpmRelationList": [],
|
||||
"minifyWXSS": true,
|
||||
"useStaticServer": true,
|
||||
"showES6CompileOption": false,
|
||||
"checkInvalidKey": true,
|
||||
"babelSetting": {
|
||||
"ignore": [],
|
||||
"disablePlugins": [],
|
||||
"outputPath": ""
|
||||
},
|
||||
"disableUseStrict": false,
|
||||
"useCompilerPlugins": false,
|
||||
"minifyWXML": true
|
||||
},
|
||||
"compileType": "miniprogram"
|
||||
}
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "2.24.5",
|
||||
"srcMiniprogramRoot": "dist/",
|
||||
"packOptions": {
|
||||
"ignore": [],
|
||||
"include": []
|
||||
},
|
||||
"condition": {},
|
||||
"editorSetting": {
|
||||
"tabIndent": "insertSpaces",
|
||||
"tabSize": 2
|
||||
}
|
||||
}
|
20
project.private.config.json
Normal file
20
project.private.config.json
Normal file
@ -0,0 +1,20 @@
|
||||
{
|
||||
"projectname": "EShop",
|
||||
"setting": {
|
||||
"compileHotReLoad": true
|
||||
},
|
||||
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
|
||||
"condition": {
|
||||
"miniprogram": {
|
||||
"list": [
|
||||
{
|
||||
"name": "",
|
||||
"pathName": "pages/sampleComparison/index",
|
||||
"query": "",
|
||||
"launchMode": "default",
|
||||
"scene": null
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
@ -164,6 +164,13 @@ export default {
|
||||
pages: [
|
||||
"index",
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
root: "pages/sampleComparison",
|
||||
pages: [
|
||||
"index",
|
||||
]
|
||||
},
|
||||
|
||||
]
|
||||
}
|
||||
|
@ -6,11 +6,11 @@
|
||||
// export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
|
||||
// export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
|
||||
// export const BASE_URL = `http://192.168.1.30:40001/lymarket` // 发
|
||||
export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
|
||||
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
|
||||
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
|
||||
// export const BASE_URL = `https://www.zzfzyc.com/lymarket` // 正式环境
|
||||
// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
|
||||
// export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
|
||||
export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
|
||||
// export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
|
||||
|
||||
// CDN
|
||||
|
4
src/pages/sampleComparison/index.config.ts
Normal file
4
src/pages/sampleComparison/index.config.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export default {
|
||||
navigationBarTitleText: '样品对比',
|
||||
enableShareAppMessage: false,
|
||||
}
|
198
src/pages/sampleComparison/index.module.scss
Normal file
198
src/pages/sampleComparison/index.module.scss
Normal file
@ -0,0 +1,198 @@
|
||||
page {
|
||||
background: #f3f3f3;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.body {
|
||||
overflow: hidden;
|
||||
|
||||
.topBox {
|
||||
margin-top: 24px;
|
||||
margin-left: 30px;
|
||||
width: 690px;
|
||||
height: 86px;
|
||||
background: #ffffff;
|
||||
border-radius: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.leftBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-left: 19px;
|
||||
|
||||
.leftFont {
|
||||
font-size: 28px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
text-align: left;
|
||||
color: #707070;
|
||||
margin-right: 14px;
|
||||
}
|
||||
|
||||
.borderBox {
|
||||
width: 0px;
|
||||
height: 62px;
|
||||
border: 2px solid #f3f3f3;
|
||||
margin-right: 39px;
|
||||
}
|
||||
|
||||
.cricleBox {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
background: #cccccc;
|
||||
border-radius: 50%;
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
.notNet {
|
||||
font-size: 28px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #aaaaaa;
|
||||
}
|
||||
}
|
||||
|
||||
.iconMore {
|
||||
margin-right: 30px;
|
||||
font-size: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.contBox {
|
||||
margin-top: 53px;
|
||||
display: flex;
|
||||
padding-left: 56px;
|
||||
|
||||
.firstBox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
|
||||
.firstLeftName {
|
||||
font-size: 26px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #707070;
|
||||
}
|
||||
|
||||
.firstLeftbox {
|
||||
width: 290px;
|
||||
height: 290px;
|
||||
background: #dddddd;
|
||||
margin-top: 13px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
border-radius: 50%;
|
||||
|
||||
.clickFont {
|
||||
font-size: 28px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #707070;
|
||||
}
|
||||
}
|
||||
|
||||
.nameColor {
|
||||
font-size: 24px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #707070;
|
||||
margin-top: 30px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.reslutBox {
|
||||
width: 692px;
|
||||
height: 180px;
|
||||
background: #ffffff;
|
||||
margin-top: 30px;
|
||||
margin-left: 29px;
|
||||
border-radius: 20px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.reslutTitle {
|
||||
overflow: hidden;
|
||||
width: 100%;
|
||||
margin-top: 41px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.titleLeft {
|
||||
margin-left: 48px;
|
||||
font-size: 26px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Bold;
|
||||
font-weight: 700;
|
||||
color: #707070;
|
||||
}
|
||||
|
||||
.titleRiht {
|
||||
margin-right: 37px;
|
||||
width: 136px;
|
||||
height: 46px;
|
||||
background: #ffd9d9;
|
||||
border-radius: 10px;
|
||||
font-size: 28px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
text-align: center;
|
||||
color: #ff4a4a;
|
||||
line-height: 46px;
|
||||
}
|
||||
|
||||
.titleRiht1 {
|
||||
background: #cdf3df;
|
||||
margin-right: 37px;
|
||||
width: 136px;
|
||||
height: 46px;
|
||||
border-radius: 10px;
|
||||
font-size: 28px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
text-align: center;
|
||||
line-height: 46px;
|
||||
color: #07C160;
|
||||
}
|
||||
}
|
||||
|
||||
.notResult {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
font-size: 26px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #ababab;
|
||||
margin-top: 14px;
|
||||
}
|
||||
|
||||
.notBox {
|
||||
margin-top: 32px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
overflow: hidden;
|
||||
|
||||
.notLeft {
|
||||
font-size: 26px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #707070;
|
||||
margin-left: 40px;
|
||||
}
|
||||
|
||||
.notright {
|
||||
font-size: 26px;
|
||||
font-family: Microsoft YaHei, Microsoft YaHei-Regular;
|
||||
font-weight: 400;
|
||||
color: #707070;
|
||||
margin-right: 37px;
|
||||
}
|
||||
}
|
||||
}
|
48
src/pages/sampleComparison/index.tsx
Normal file
48
src/pages/sampleComparison/index.tsx
Normal file
@ -0,0 +1,48 @@
|
||||
|
||||
import { Image, Text, Textarea, View } from "@tarojs/components"
|
||||
import Taro, { useDidShow, usePullDownRefresh, useRouter } from "@tarojs/taro";
|
||||
import classnames from "classnames";
|
||||
import styles from './index.module.scss'
|
||||
export default () => {
|
||||
return (
|
||||
<View className={styles.body}>
|
||||
<View className={styles.topBox}>
|
||||
<View className={styles.leftBox}>
|
||||
<View className={styles.leftFont}>蓝牙设备</View>
|
||||
<View className={styles.borderBox}></View>
|
||||
<View className={styles.cricleBox}></View>
|
||||
<View className={styles.notNet}></View>
|
||||
</View>
|
||||
<Text className={classnames("iconfont icon-a-moreback", styles.iconMore)}></Text>
|
||||
</View>
|
||||
<View className={styles.contBox} >
|
||||
<View className={styles.firstBox} style="margin-right:27px">
|
||||
<View className={styles.firstLeftName}>对比样品</View>
|
||||
<View className={styles.firstLeftbox}>
|
||||
<View className={styles.clickFont}>点击取色</View>
|
||||
</View>
|
||||
<View className={styles.nameColor}>--</View>
|
||||
</View>
|
||||
<View className={styles.firstBox}>
|
||||
<View className={styles.firstLeftName}>对比样品</View>
|
||||
<View className={styles.firstLeftbox}>
|
||||
<View className={styles.clickFont}>点击取色</View>
|
||||
</View>
|
||||
<View className={styles.nameColor}>--</View>
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.reslutBox}>
|
||||
<View className={styles.reslutTitle}>
|
||||
<View className={styles.titleLeft}>测量结果</View>
|
||||
{/* <View className={styles.titleRiht}>不合格</View> */}
|
||||
<View className={styles.titleRiht1}>合格</View>
|
||||
</View>
|
||||
{/* <View className={styles.notResult}>暂无数据</View> */}
|
||||
<View className={styles.notBox}>
|
||||
<View className={styles.notLeft}>色差值: 0.2</View>
|
||||
<View className={styles.notright}>无明显色差</View>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
@ -179,7 +179,7 @@ const Assets = () => {
|
||||
// 功能
|
||||
const Main = memo(() => {
|
||||
let menu = [{ text: "地址管理", icon: "icon-shoucang",url: "/pages/addressManager/index" },{ text: "码单管理", icon: "icon-shoucang",url: "/pages/weightList/index" },
|
||||
{ text: "我的收藏", icon: "icon-shoucang" }, { text: "颜色对比", icon: "icon-yanseduibi" },
|
||||
{ text: "我的收藏", icon: "icon-shoucang" }, { text: "颜色对比", icon: "icon-yanseduibi",url: "/pages/sampleComparison/index" },
|
||||
{ text: "分享推广", icon: "icon-fenxiang" }, { text: "团队邀请", icon: "icon-yaoqingtuandui" }]
|
||||
return (
|
||||
<View className={`${styles.crad} ${styles['card-main']} ${styles['card-feature']}`}>
|
||||
|
Loading…
x
Reference in New Issue
Block a user