java_project
/
logpm
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

解决合并

master
qb 1 year ago
parent
c627d32658
commit
cae73c847a
4 changed files with 4 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      config/host.js
  2. 5
      manifest.json
  3. 2
      unpackage/dist/build/app-plus/pages/user/user.css
  4. 2
      unpackage/dist/build/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css

4
config/host.js
Unescape View File

@ -15,9 +15,9 @@
// const devhost = 'http://192.168.6.148:9777/'
// const devhost = 'http://192.168.6.141:8777/'
// cg
const devhost = 'http://192.168.10.57:13000/'
// const devhost = 'http://192.168.10.57:13000/'
// 正式
// const devhost = 'https://h5uapi.huitongys.com/'
const devhost = 'https://h5uapi.huitongys.com/'
// cg
// const devhost = 'http://192.168.10.200:13000/'
/**

5
manifest.json
Unescape View File

@ -2,13 +2,8 @@
"name" : "货无忧",
"appid" : "__UNI__EB22F37",
"description" : "",
<<<<<<< HEAD
"versionName" : "1.1.06",
"versionCode" : 1106,
=======
"versionName" : "1.1.07",
"versionCode" : 1107,
>>>>>>> dev
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

2
unpackage/dist/build/app-plus/pages/user/user.css vendored
Unescape View File

@ -1 +1 @@
.bgmabx{position:fixed;left:0;top:0;background-color:rgba(0,0,0,.314);width:100vw;height:100vh;z-index:9999999999999}.bgmabx .changkus{width:100vw;background-color:#fff;position:absolute;bottom:0;left:0;border-radius:.9375rem .9375rem 0 0;box-sizing:border-box}.bgmabx .changkus .tis{position:relative;display:flex;align-items:center;flex-direction:column}.bgmabx .changkus .bgimgs{position:absolute;left:0;top:0;width:100vw;height:100%}.bgmabx .changkus .ckbgcc{position:absolute;top:-4.6875rem;right:.625rem;width:8.125rem;height:8.125rem}.bgmabx .changkus .titlck{width:20.3125rem;font-size:1.0625rem;font-weight:500;color:#020b18;padding-top:.9375rem}.bgmabx .changkus .scvuew{width:18rem;height:14.6875rem;margin-top:1.25rem;margin-bottom:.625rem}.bgmabx .changkus .scvuew .maboxs{display:flex;flex-wrap:wrap;align-items:center}.bgmabx .changkus .scvuew .maboxs .xzck{background-color:#faf2e9!important;border-color:#d3832a!important;color:#d3832a!important}.bgmabx .changkus .scvuew .maboxs .items{width:8.5rem;height:2.25rem;background-color:#fff;border-radius:.25rem;opacity:1;border:.0625rem solid #EEEEEE;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#90a0af;margin-bottom:.625rem}.bgmabx .changkus .scvuew .maboxs .items:nth-child(odd){margin-right:.625rem}.bgmabx .changkus .submitcheck{width:21.4375rem;height:3.125rem;background:#D3832A;border-radius:.5rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff;margin-bottom:.9375rem;position:relative}.titles{position:absolute;left:50%;top:2.1875rem;transform:translate(-50%);font-size:1.125rem;font-weight:400;color:#fff;z-index:5}.butout{width:12.5rem;height:2.75rem;background:#edd9c3;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:500;color:#d3832a;margin:auto;margin-top:1.875rem;box-sizing:border-box}.zhanwei{width:100%;height:2.5rem}.btsview{position:relative;display:flex;flex-direction:column;width:100%;padding:.8125rem;box-sizing:border-box;border-radius:.9375rem .9375rem 0 0;margin-top:1.5625rem;background-color:#fff;padding-bottom:0}.btsview>uni-view{display:flex;align-items:center;justify-content:space-between;padding:1.25rem;box-sizing:border-box;border-bottom:.0625rem solid #EEEEEE;padding-right:0;padding-left:.625rem}.btsview>uni-view:nth-last-child(1){border-bottom:none}.btsview>uni-view>uni-view:nth-of-type(1){display:flex;align-items:center;justify-content:center}.btsview>uni-view>uni-view:nth-of-type(1)>uni-image{width:1.25rem;height:1.25rem;margin-right:.625rem}.btsview>uni-view>uni-view:nth-of-type(1)>uni-view{font-size:1rem;font-weight:500;color:#3d3d3d}.btsview>uni-view>uni-view:nth-of-type(2)>uni-image{width:1rem;height:1rem}.userviews{display:flex;align-items:center;position:relative;width:17.5rem;margin:auto;margin-top:6.25rem}.userviews>uni-image{width:5rem;height:5rem;box-sizing:border-box;margin-right:.75rem}.userviews>uni-view{width:12.5rem;display:flex;flex-direction:column;align-items:flex-start;color:#fff}.userviews>uni-view>uni-view{display:flex;flex-direction:column;align-items:flex-start}.userviews>uni-view>uni-view:nth-of-type(1){font-size:1.25rem;font-weight:700;margin-bottom:.9375rem}.userviews>uni-view>uni-view>uni-view{display:flex;align-items:center}.userviews>uni-view>uni-view>uni-view:nth-of-type(1){font-size:1rem;font-weight:700;margin-bottom:.3125rem}.userviews>uni-view>uni-view>uni-view:nth-of-type(2){font-size:.875rem}.userviews>uni-view>uni-view>uni-view>uni-image{width:1rem;height:1rem}.usebg{width:100%;height:14.875rem;position:absolute;left:0;top:0}.login{width:8.125rem;height:2.8125rem;display:flex;align-items:center;justify-content:center;background-color:#0073ff;color:#fff;border-radius:2.8125rem;margin:auto;margin-top:5.625rem}.contmabox{display:flex;flex-direction:column;width:100%;height:12.5rem;background-color:rgba(250,140,22,.855)}
.bgmabx{position:fixed;left:0;top:0;background-color:rgba(0,0,0,.314);width:100vw;height:100vh;z-index:9999999999999}.bgmabx .changkus{width:100vw;background-color:#fff;position:absolute;bottom:0;left:0;border-radius:.9375rem .9375rem 0 0;box-sizing:border-box}.bgmabx .changkus .tis{position:relative;display:flex;align-items:center;flex-direction:column}.bgmabx .changkus .bgimgs{position:absolute;left:0;top:0;width:100vw;height:100%}.bgmabx .changkus .ckbgcc{position:absolute;top:-4.6875rem;right:.625rem;width:8.125rem;height:8.125rem}.bgmabx .changkus .titlck{width:20.3125rem;font-size:1.0625rem;font-weight:500;color:#020b18;padding-top:.9375rem}.bgmabx .changkus .scvuew{width:18rem;height:14.6875rem;margin-top:1.25rem;margin-bottom:.625rem}.bgmabx .changkus .scvuew .maboxs{display:flex;flex-wrap:wrap;align-items:center}.bgmabx .changkus .scvuew .maboxs .xzck{background-color:#faf2e9!important;border-color:#d3832a!important;color:#d3832a!important}.bgmabx .changkus .scvuew .maboxs .items{width:8.5rem;height:2.25rem;background-color:#fff;border-radius:.25rem;opacity:1;border:.0625rem solid #EEEEEE;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#90a0af;margin-bottom:.625rem}.bgmabx .changkus .scvuew .maboxs .items:nth-child(odd){margin-right:.625rem}.bgmabx .changkus .submitcheck{width:21.4375rem;height:3.125rem;background:#D3832A;border-radius:.5rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:400;color:#fff;margin-bottom:.9375rem;position:relative}.titles{position:absolute;left:50%;top:2.1875rem;transform:translate(-50%);font-size:1.125rem;font-weight:400;color:#fff;z-index:5}.butout{width:12.5rem;height:2.75rem;background:#edd9c3;border-radius:.25rem;display:flex;align-items:center;justify-content:center;font-size:1rem;font-weight:500;color:#d3832a;margin:auto;margin-top:1.875rem;box-sizing:border-box}.zhanwei{width:100%;height:2.5rem}.btsview{position:relative;display:flex;flex-direction:column;width:100%;padding:.8125rem;box-sizing:border-box;border-radius:.9375rem .9375rem 0 0;margin-top:1.5625rem;background-color:#fff;padding-bottom:0}.btsview>uni-view{display:flex;align-items:center;justify-content:space-between;padding:1.25rem;box-sizing:border-box;border-bottom:.0625rem solid #EEEEEE;padding-right:0;padding-left:.625rem}.btsview>uni-view:nth-last-child(1){border-bottom:none}.btsview>uni-view>uni-view:nth-of-type(1){display:flex;align-items:center;justify-content:center}.btsview>uni-view>uni-view:nth-of-type(1)>uni-image{width:1.25rem;height:1.25rem;margin-right:.625rem}.btsview>uni-view>uni-view:nth-of-type(1)>uni-view{font-size:1rem;font-weight:500;color:#3d3d3d}.btsview>uni-view>uni-view:nth-of-type(2)>uni-image{width:1rem;height:1rem}.userviews{display:flex;align-items:center;position:relative;width:17.5rem;margin:auto;margin-top:6.25rem}.userviews>uni-image{width:5rem;height:5rem;box-sizing:border-box;margin-right:.75rem}.userviews>uni-view{width:12.5rem;display:flex;flex-direction:column;align-items:flex-start;color:#fff}.userviews>uni-view>uni-view{display:flex;flex-direction:column;align-items:flex-start}.userviews>uni-view>uni-view:nth-of-type(1){font-size:1.25rem;font-weight:700;margin-bottom:.9375rem}.userviews>uni-view>uni-view>uni-view{display:flex;align-items:center}.userviews>uni-view>uni-view>uni-view:nth-of-type(1){font-size:1rem;font-weight:700;margin-bottom:.3125rem}.userviews>uni-view>uni-view>uni-view:nth-of-type(2){font-size:.875rem}.userviews>uni-view>uni-view>uni-view>uni-image{width:1rem;height:1rem}.usebg{width:100%;height:14.875rem;position:absolute;left:0;top:0}.login{width:8.125rem;height:2.8125rem;display:flex;align-items:center;justify-content:center;background-color:#0073ff;color:#fff;border-radius:2.8125rem;margin:auto;margin-top:5.625rem}.contmabox{display:flex;flex-direction:column;width:100%;height:12.5rem;background-color:rgba(250,140,22,.855)}.profilePhoto{background:#fff;border-radius:.3125rem}

2
unpackage/dist/build/app-plus/pagesHome/pages/CustomerOrdersDetails/CustomerOrdersDetails.css vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save