dolphin-weex-bc 0.0.11 → 0.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dolphin-weex-bc",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "",
   "main": "index.js",
   "directories": {
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "dolphin-native-bridge": "^0.5.16",
-    "dolphin-weex-ui": "^2.3.3",
+    "dolphin-weex-ui": "^2.4.0",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "md5-node": "^1.0.1"

package/packages/dof-consumables/assets/css/index.css

@@ -170,7 +170,6 @@
   height: 160px;
   padding: 0 32px 0 36px;
   /* background-image: linear-gradient(to bottom, #f5fcfe, #FFFFFF); */
-  background: #F6F7F9;
   /* border: 2px solid #FFFFFF; */
   border-bottom: 1px solid #DDDDDD;
   border-radius: 24px 24px 0 0;
@@ -188,6 +187,8 @@
 }
 .title-icon{
   margin-right: 28px;
+  width: 88px;
+  height: 88px;
   /* border-radius: 12px; */
 }
 .title-icon3{
@@ -196,7 +197,7 @@
 .title-txt1-1{
   font-size: 28px;
   font-weight: 500;
-  color: #1E2E37;;
+  color: #1E2E37;
   margin-bottom: 16px;
   flex: 1;
   lines: 2;
@@ -219,9 +220,18 @@
   font-size: 24px;
   color: #8E969B;
 }
+.title-txt2-overflow{
+  max-width: 426px;
+  overflow: hidden;
+  lines: 1;
+  text-overflow: ellipsis;
+}
+.title-txt2-user{
+  font-size: 24px;
+  color: #8E969B;
+}
 .title-txt3-box{
   flex-direction: row;
-  flex: 1;
 }
 .title-txt3-1{
   max-width: 426px;
@@ -241,11 +251,10 @@
   display: flex;
   flex-direction: row;
   align-items: center;
-  background-color: #F6F7F9;
 }
-.material-item:nth-child(){
+/* .material-item:nth-child(){
   border-radius: 0 0 24px 24px;
-}
+} */
 .item-left{
   /* margin-right: 32px; */
 }
@@ -353,7 +362,9 @@
 
 }
 .arrow-icon{
-
+  width:24px; 
+  height:24px;
+  color:#C7C7CC;
 }
 
 .no-data{

package/packages/dof-consumables/assets/css/index_diablo.css

@@ -0,0 +1,230 @@
+
+.material-title-isDiablo{
+  background-image: linear-gradient(to bottom, #64747E, #171C1F);
+  border-bottom: 1px solid #23282b;
+}
+
+
+.title-txt2-o1{
+  max-width: 360px;
+  overflow: hidden;
+  lines: 1;
+  text-overflow: ellipsis;
+  font-size: 22px;
+  color: #797C7E;
+}
+
+.title-txt2-o2{
+ max-width: 360px;
+  overflow: hidden;
+  lines: 1;
+  text-overflow: ellipsis;
+  font-size: 22px;
+  color: #8E969B;
+}
+
+.title-txt2-o3{
+  max-width: 426px;
+  overflow: hidden;
+  lines: 1;
+  text-overflow: ellipsis;
+  font-size: 24px;
+  color: #797C7E;
+}
+
+.title-txt2-o4{
+  max-width: 426px;
+  overflow: hidden;
+  lines: 1;
+  text-overflow: ellipsis;
+  font-size: 24px;
+  color: #8E969B;
+}
+
+.title-txt2-user1{
+  font-size: 22px;
+  color: #797C7E;
+}
+
+.title-txt2-user1-1{
+  font-size: 22px;
+  color: #303538;
+}
+
+.title-txt2-user2{
+  font-size: 22px;
+  color: #8E969B;
+}
+
+.title-txt2-user3{
+  font-size: 24px;
+  color: #797C7E;
+}
+
+.title-txt2-user3-3{
+  font-size: 24px;
+  color: #303538;
+}
+
+.title-txt2-user4{
+  font-size: 24px;
+  color: #8E969B;
+}
+
+.title-txt2-user-n1{
+  font-size: 22px;
+  color: #D35926;
+}
+
+.title-txt2-user-n2{
+  font-size: 22px;
+  color: #F56428;
+}
+
+.title-txt2-user-n3{
+  font-size: 24px;
+  color: #D35926;
+}
+
+.title-txt2-user-n4{
+  font-size: 24px;
+  color: #F56428;
+}
+
+
+.title-icon-isScale{
+  width: 81px;
+  height: 81px;
+}
+
+.title-txt1-1-isScale{
+  font-size: 25px;
+}
+
+.title-txt1-1-isDiablo{
+  color: #CFCFD0;
+}
+
+.title-txt2-user-isScale{
+  font-size: 22px;
+}
+
+.title-txt2-user-isDiablo{
+  color: #797C7E;
+}
+
+.title-txt3-isDiablo{
+  color: #D35926;
+}
+
+.material-item-isScale{
+  height: 147px;
+}
+
+.material-item-isDiablo{
+  background-color: #171C1F;
+}
+
+.drag-slider-isScale{
+  width: 81px;
+  height: 81px;
+}
+
+.progresscycle-wrapper-isScale{
+  width: 81px;
+  height: 81px;
+}
+
+.progresscycle-wrapper-isDiablo{
+    background-color: #171C1F;
+}
+
+.progresscycle-isScale{
+  width: 88px;
+  height: 88px;
+}
+
+.circle-noData-isScale{
+  width: 81px;
+  height: 81px;
+}
+
+.circle-noData-isDiablo{
+  background-color: #1E2326;
+}
+
+.noData-txt-isDiablo{
+  color: #8E969B;
+}
+
+.circle-noData1-isScale{
+ width: 81px;
+ height: 81px;
+}
+
+.circle-noData1-isDiablo{
+  background-color: #1E2326;
+}
+
+.item-txt1-isScale{
+  font-size: 29px;
+}
+
+.item-txt1-isDiablo{
+  color: #CFCFD0;
+}
+
+.item-txt3-isScale{
+  font-size: 22px;
+}
+
+.item-txt3-isDiablo{
+  color: #D35926;
+}
+
+.item-txt4-isScale{
+  font-size: 22px;
+}
+
+.item-txt4-isDiablo{
+  color: #797C7E;
+}
+
+.item-txt5-isScale{
+  font-size: 22px;
+  max-width: 280px;
+  overflow: hidden;
+  lines: 1;
+  text-overflow: ellipsis;
+}
+
+.item-txt5-isDiablo{
+  color: #BE8214;
+}
+
+.btn-purhase-isScale-isScale {
+  width: 88px;
+  height: 42px;
+  border-radius: 25px;
+}
+
+.btn-purhase-isScale-isDiablo {
+  background: rgba(4,144,211,0.10);
+}
+
+.txt-purhase-isScale {
+  font-size: 20px;
+}
+
+.txt-purhase-isDiablo {
+  color: #0490D3;
+}
+
+.arrow-icon-isScale{
+  width:22px; 
+  height:22px;
+}
+
+.arrow-icon-isDiablo{
+  color:#787b7d;
+}