Browse Source

合并冲突

master
gaoxs 5 years ago
parent
commit
3903a7f31b
  1. 2
      assets/css/base.css
  2. 2
      assets/css/base.css.map
  3. 4
      assets/css/base.less
  4. 2
      assets/css/reset.css
  5. 2
      assets/css/reset.css.map
  6. 2
      assets/css/reset.less
  7. 2
      assets/css/style.css
  8. 2
      assets/css/style.css.map
  9. 90
      assets/css/style.less
  10. 1
      pages/authorization/index.vue
  11. 19
      pages/orderAdmin/OrderIndex/index.vue
  12. BIN
      static/images/orderIndex.png
  13. 53
      utils/index.js
  14. 6
      utils/request.js

2
assets/css/base.css

@ -1,2 +1,2 @@
@charset "UTF-8";.font-color-red{color:#00c17b !important}.bg-color-red{background-color:#00c17b !important}.icon-color{color:#00c17b}.cart-color{color:#00c17b !important;border:1px solid #00c17b !important}.padding20{padding:20rpx}.pad20{padding:0 20rpx}.padding30{padding:30rpx}.pad30{padding:0 30rpx}.acea-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.acea-row.row-middle{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.acea-row.row-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start}.acea-row.row-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.acea-row.row-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-right{-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.acea-row.row-left{-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start}.acea-row.row-between{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-around{-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column-around{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.acea-row.row-column-between{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-center-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-between-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.slider-banner{position:relative;width:100%;overflow:hidden}.slider-banner .swiper-container{height:100%}.slider-banner image{display:block;width:100%;height:100%}.start{width:122rpx;height:30rpx;background-image:url("https://h5.dayouqiantu.cn/static/images/start.png");background-repeat:no-repeat;-webkit-background-size:122rpx auto;background-size:122rpx auto}.start.star5{background-position:0 3rpx}.start.star4{background-position:0 -30rpx}.start.star3{background-position:0 -70rpx}.start.star2{background-position:0 -105rpx}.start.star1{background-position:0 -140rpx}.start.star0{background-position:0 -175rpx}.checkbox-wrapper{position:relative}.checkbox-wrapper input{display:none}.checkbox-wrapper .icon{position:absolute;left:0;top:50%;display:inline-block;width:18px;height:18px;border:1px solid #cccccc;-webkit-border-radius:50%;border-radius:50%;-webkit-transform:translate(0, -50%);-ms-transform:translate(0, -50%);transform:translate(0, -50%)}.checkbox-wrapper input:checked+.icon{background-color:#e93323;border-color:#e93323;background-image:url("https://h5.dayouqiantu.cn/static/images/enter.png");-webkit-background-size:21rpx 15rpx;background-size:21rpx 15rpx;background-repeat:no-repeat;background-position:center center}.Loads{height:80rpx;font-size:25rpx;color:#000}.Loads .iconfont{font-size:30rpx;margin-right:10rpx;height:32rpx;line-height:32rpx}@-webkit-keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.loadingpic{-webkit-animation:load 3s linear 1s infinite;animation:load 3s linear 1s infinite}.loading{-webkit-animation:load linear 1s infinite;animation:load linear 1s infinite} @charset "UTF-8";.font-color-red{color:#00c17b !important}.bg-color-red{background-color:#00c17b !important}.icon-color{color:#00c17b}.cart-color{color:#00c17b !important;border:1px solid #00c17b !important}.padding20{padding:20rpx}.pad20{padding:0 20rpx}.padding30{padding:30rpx}.pad30{padding:0 30rpx}.acea-row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.acea-row.row-middle{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.acea-row.row-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start}.acea-row.row-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.acea-row.row-center{-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-right{-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.acea-row.row-left{-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start}.acea-row.row-between{-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-around{-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column-around{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:space-around;-ms-flex-pack:distribute;justify-content:space-around}.acea-row.row-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.acea-row.row-column-between{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.acea-row.row-center-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.acea-row.row-between-wrapper{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.slider-banner{position:relative;width:100%;overflow:hidden}.slider-banner .swiper-container{height:100%}.slider-banner image{display:block;width:100%;height:100%}.start{width:122rpx;height:30rpx;background-image:url("https://h5.yixiang.co/static/images/start.png");background-repeat:no-repeat;-webkit-background-size:122rpx auto;background-size:122rpx auto}.start.star5{background-position:0 3rpx}.start.star4{background-position:0 -30rpx}.start.star3{background-position:0 -70rpx}.start.star2{background-position:0 -105rpx}.start.star1{background-position:0 -140rpx}.start.star0{background-position:0 -175rpx}.checkbox-wrapper{position:relative}.checkbox-wrapper input{display:none}.checkbox-wrapper .icon{position:absolute;left:0;top:50%;display:inline-block;width:18px;height:18px;border:1px solid #cccccc;-webkit-border-radius:50%;border-radius:50%;-webkit-transform:translate(0, -50%);-ms-transform:translate(0, -50%);transform:translate(0, -50%)}.checkbox-wrapper input:checked+.icon{background-color:#e93323;border-color:#e93323;background-image:url("https://h5.yixiang.co/static/images/enter.png");-webkit-background-size:21rpx 15rpx;background-size:21rpx 15rpx;background-repeat:no-repeat;background-position:center center}.Loads{height:80rpx;font-size:25rpx;color:#000}.Loads .iconfont{font-size:30rpx;margin-right:10rpx;height:32rpx;line-height:32rpx}@-webkit-keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load{from{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.loadingpic{-webkit-animation:load 3s linear 1s infinite;animation:load 3s linear 1s infinite}.loading{-webkit-animation:load linear 1s infinite;animation:load linear 1s infinite}
/*# sourceMappingURL=./base.css.map */ /*# sourceMappingURL=./base.css.map */

2
assets/css/base.css.map

@ -1 +1 @@
{"version":3,"sources":["base.less"],"names":[],"mappings":"AAAA,iBAIA,gBACE,wBAAA,CAEF,cACE,mCAAA,CAEF,YACE,aAAA,CAEF,YACE,yBACA,mCAAA,CAGF,WACE,aAAA,CAGF,OACE,eAAA,CAGF,WACE,aAAA,CAGF,OACE,eAAA,CAGF,UACE,oBACA,AADA,qBACA,AADA,oBACA,AADA,aACA,uBAAA,mBAAA,cAAA,CAGF,qBACE,yBAAA,2BAAA,sBAAA,kBAAA,CAEF,kBACE,wBAAA,+BAAA,qBAAA,sBAAA,CAEF,qBACE,sBAAA,6BAAA,mBAAA,oBAAA,CAEF,qBACE,wBAAA,+BAAA,qBAAA,sBAAA,CAEF,oBACE,qBAAA,iCAAA,kBAAA,wBAAA,CAEF,mBACE,uBAAA,mCAAA,oBAAA,0BAAA,CAEF,sBACE,yBAAA,sCAAA,sBAAA,6BAAA,CAEF,qBACE,qCAAA,yBAAA,4BAAA,CAEF,4BACE,4BACA,AADA,6BACA,AADA,8BACA,AADA,0BACA,AADA,sBACA,qCAAA,yBAAA,4BAAA,CAEF,qBACE,4BAAA,6BAAA,8BAAA,0BAAA,qBAAA,CAEF,6BACE,4BACA,AADA,6BACA,AADA,8BACA,AADA,0BACA,AADA,sBACA,yBAAA,sCAAA,sBAAA,6BAAA,CAGF,6BACE,yBACA,AADA,2BACA,AADA,sBACA,AADA,mBACA,wBAAA,+BAAA,qBAAA,sBAAA,CAGF,8BACE,yBACA,AADA,2BACA,AADA,sBACA,AADA,mBACA,yBAAA,sCAAA,sBAAA,6BAAA,CAIF,eACE,kBACA,WAEA,eAAA,CAKF,iCACE,WAAA,CAEF,qBACE,cACA,WACA,WAAA,CAEF,OACE,aACA,aACA,0EACA,4BACA,oCAAA,2BAAA,CAEF,aACE,0BAAA,CAEF,aACE,4BAAA,CAEF,aACE,4BAAA,CAEF,aACE,6BAAA,CAEF,aACE,6BAAA,CAEF,aACE,6BAAA,CAGF,kBACE,iBAAA,CAEF,wBACE,YAAA,CAEF,wBACE,kBACA,OACA,QACA,qBACA,WACA,YACA,yBACA,0BACA,AADA,kBACA,qCAAW,AAAX,iCAAW,AAAX,4BAAW,CAEb,sCACE,yBACA,qBACA,0EACA,oCACA,AADA,4BACA,4BACA,iCAAA,CAEF,OACE,aACA,gBACA,UAAA,CAEF,iBACE,gBACA,mBACA,aACA,iBAAA,CAGF,wBACE,KACE,+BAAW,AAAX,sBAAW,CAEb,GACE,iCAAW,AAAX,wBAAW,CAAA,CAGf,AARA,gBACE,KACE,+BAAW,AAAX,sBAAW,CAEb,GACE,iCAAW,AAAX,wBAAW,CAAA,CAGf,YACE,6CAAA,oCAAA,CAEF,SACE,0CAAA,iCAAA,CAAA","file":"to.css","sourcesContent":[null]} {"version":3,"sources":["base.less"],"names":[],"mappings":"AAAA,iBAIA,gBACE,wBAAA,CAEF,cACE,mCAAA,CAEF,YACE,aAAA,CAEF,YACE,yBACA,mCAAA,CAGF,WACE,aAAA,CAGF,OACE,eAAA,CAGF,WACE,aAAA,CAGF,OACE,eAAA,CAGF,UACE,oBACA,AADA,qBACA,AADA,oBACA,AADA,aACA,uBAAA,mBAAA,cAAA,CAGF,qBACE,yBAAA,2BAAA,sBAAA,kBAAA,CAEF,kBACE,wBAAA,+BAAA,qBAAA,sBAAA,CAEF,qBACE,sBAAA,6BAAA,mBAAA,oBAAA,CAEF,qBACE,wBAAA,+BAAA,qBAAA,sBAAA,CAEF,oBACE,qBAAA,iCAAA,kBAAA,wBAAA,CAEF,mBACE,uBAAA,mCAAA,oBAAA,0BAAA,CAEF,sBACE,yBAAA,sCAAA,sBAAA,6BAAA,CAEF,qBACE,qCAAA,yBAAA,4BAAA,CAEF,4BACE,4BACA,AADA,6BACA,AADA,8BACA,AADA,0BACA,AADA,sBACA,qCAAA,yBAAA,4BAAA,CAEF,qBACE,4BAAA,6BAAA,8BAAA,0BAAA,qBAAA,CAEF,6BACE,4BACA,AADA,6BACA,AADA,8BACA,AADA,0BACA,AADA,sBACA,yBAAA,sCAAA,sBAAA,6BAAA,CAGF,6BACE,yBACA,AADA,2BACA,AADA,sBACA,AADA,mBACA,wBAAA,+BAAA,qBAAA,sBAAA,CAGF,8BACE,yBACA,AADA,2BACA,AADA,sBACA,AADA,mBACA,yBAAA,sCAAA,sBAAA,6BAAA,CAIF,eACE,kBACA,WAEA,eAAA,CAKF,iCACE,WAAA,CAEF,qBACE,cACA,WACA,WAAA,CAEF,OACE,aACA,aACA,sEACA,4BACA,oCAAA,2BAAA,CAEF,aACE,0BAAA,CAEF,aACE,4BAAA,CAEF,aACE,4BAAA,CAEF,aACE,6BAAA,CAEF,aACE,6BAAA,CAEF,aACE,6BAAA,CAGF,kBACE,iBAAA,CAEF,wBACE,YAAA,CAEF,wBACE,kBACA,OACA,QACA,qBACA,WACA,YACA,yBACA,0BACA,AADA,kBACA,qCAAW,AAAX,iCAAW,AAAX,4BAAW,CAEb,sCACE,yBACA,qBACA,sEACA,oCACA,AADA,4BACA,4BACA,iCAAA,CAEF,OACE,aACA,gBACA,UAAA,CAEF,iBACE,gBACA,mBACA,aACA,iBAAA,CAGF,wBACE,KACE,+BAAW,AAAX,sBAAW,CAEb,GACE,iCAAW,AAAX,wBAAW,CAAA,CAGf,AARA,gBACE,KACE,+BAAW,AAAX,sBAAW,CAEb,GACE,iCAAW,AAAX,wBAAW,CAAA,CAGf,YACE,6CAAA,oCAAA,CAEF,SACE,0CAAA,iCAAA,CAAA","file":"to.css","sourcesContent":[null]}

4
assets/css/base.less

@ -104,7 +104,7 @@
.start { .start {
width: 1.22*100rpx; width: 1.22*100rpx;
height: 0.3*100rpx; height: 0.3*100rpx;
background-image: url("https://h5.dayouqiantu.cn/static/images/start.png"); background-image: url("https://h5.yixiang.co/static/images/start.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 1.22*100rpx auto; background-size: 1.22*100rpx auto;
} }
@ -147,7 +147,7 @@
.checkbox-wrapper input:checked + .icon { .checkbox-wrapper input:checked + .icon {
background-color: #e93323; background-color: #e93323;
border-color: #e93323; border-color: #e93323;
background-image: url("https://h5.dayouqiantu.cn/static/images/enter.png"); background-image: url("https://h5.yixiang.co/static/images/enter.png");
background-size: 0.21*100rpx 0.15*100rpx; background-size: 0.21*100rpx 0.15*100rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;

2
assets/css/reset.css

@ -1,2 +1,2 @@
input{line-height:normal;-webkit-box-sizing:border-box;box-sizing:border-box}@font-face{font-family:'GuildfordProBook 5';src:url('https://h5.dayouqiantu.cn/static/iconfont/GuildfordProBook5.otf')}[v-cloak]{display:none}.iconfont{font-size:36rpx}@media (-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5){.border-1px::after{-webkit-transform:scaleY(.7);-ms-transform:scaleY(.7);transform:scaleY(.7)}.border-1px::before{-webkit-transform:scaleY(.7);-ms-transform:scaleY(.7);transform:scaleY(.7)}}@media (-webkit-min-device-pixel-ratio:2),(min-device-pixel-ratio:2){.border-1px::after{-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.border-1px::before{-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}}@media (-webkit-min-device-pixel-ratio:3),(min-device-pixel-ratio:3){.border-1px::after{-webkit-transform:scaleY(.33);-ms-transform:scaleY(.33);transform:scaleY(.33)}.border-1px::before{-webkit-transform:scaleY(.33);-ms-transform:scaleY(.33);transform:scaleY(.33)}}.line1{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap;width:100%}.line2{word-break:break-all;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden}.mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:55;background-color:rgba(0,0,0,0.5)} input{line-height:normal;-webkit-box-sizing:border-box;box-sizing:border-box}@font-face{font-family:'GuildfordProBook 5';src:url('https://h5.yixiang.co/static/iconfont/GuildfordProBook5.otf')}[v-cloak]{display:none}.iconfont{font-size:36rpx}@media (-webkit-min-device-pixel-ratio:1.5),(min-device-pixel-ratio:1.5){.border-1px::after{-webkit-transform:scaleY(.7);-ms-transform:scaleY(.7);transform:scaleY(.7)}.border-1px::before{-webkit-transform:scaleY(.7);-ms-transform:scaleY(.7);transform:scaleY(.7)}}@media (-webkit-min-device-pixel-ratio:2),(min-device-pixel-ratio:2){.border-1px::after{-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}.border-1px::before{-webkit-transform:scaleY(.5);-ms-transform:scaleY(.5);transform:scaleY(.5)}}@media (-webkit-min-device-pixel-ratio:3),(min-device-pixel-ratio:3){.border-1px::after{-webkit-transform:scaleY(.33);-ms-transform:scaleY(.33);transform:scaleY(.33)}.border-1px::before{-webkit-transform:scaleY(.33);-ms-transform:scaleY(.33);transform:scaleY(.33)}}.line1{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap;width:100%}.line2{word-break:break-all;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden}.mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:55;background-color:rgba(0,0,0,0.5)}
/*# sourceMappingURL=./reset.css.map */ /*# sourceMappingURL=./reset.css.map */

2
assets/css/reset.css.map

@ -1 +1 @@
{"version":3,"sources":["reset.less"],"names":[],"mappings":"AAAA,MAAM,mBAAqB,8BAAA,qBAAA,CAC3B,WACE,iCACA,0EAAS,CAEX,UACE,YAAA,CAEF,UACE,eAAA,CAGF,yEACE,mBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAEb,oBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAAA,CAGf,qEACE,mBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAEb,oBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAAA,CAGf,qEACE,mBACE,8BAAW,AAAX,0BAAW,AAAX,qBAAW,CAEb,oBACE,8BAAW,AAAX,0BAAW,AAAX,qBAAW,CAAA,CAGf,OAAO,gBAAgB,0BAAuB,AAAvB,uBAAuB,mBAAmB,UAAA,CACjE,OAAO,qBAAqB,oBAAoB,qBAAqB,4BAA4B,eAAA,CACjG,MAAM,eAAe,MAAM,OAAO,QAAQ,SAAS,WAAW,gCAAA,CAAA","file":"to.css","sourcesContent":[null]} {"version":3,"sources":["reset.less"],"names":[],"mappings":"AAAA,MAAM,mBAAqB,8BAAA,qBAAA,CAC3B,WACE,iCACA,sEAAS,CAEX,UACE,YAAA,CAEF,UACE,eAAA,CAGF,yEACE,mBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAEb,oBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAAA,CAGf,qEACE,mBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAEb,oBACE,6BAAW,AAAX,yBAAW,AAAX,oBAAW,CAAA,CAGf,qEACE,mBACE,8BAAW,AAAX,0BAAW,AAAX,qBAAW,CAEb,oBACE,8BAAW,AAAX,0BAAW,AAAX,qBAAW,CAAA,CAGf,OAAO,gBAAgB,0BAAuB,AAAvB,uBAAuB,mBAAmB,UAAA,CACjE,OAAO,qBAAqB,oBAAoB,qBAAqB,4BAA4B,eAAA,CACjG,MAAM,eAAe,MAAM,OAAO,QAAQ,SAAS,WAAW,gCAAA,CAAA","file":"to.css","sourcesContent":[null]}

2
assets/css/reset.less

@ -1,7 +1,7 @@
input{line-height: normal; box-sizing:border-box;} input{line-height: normal; box-sizing:border-box;}
@font-face { @font-face {
font-family: 'GuildfordProBook 5'; font-family: 'GuildfordProBook 5';
src: url('https://h5.dayouqiantu.cn/static/iconfont/GuildfordProBook5.otf'); src: url('https://h5.yixiang.co/static/iconfont/GuildfordProBook5.otf');
} }
[v-cloak] { [v-cloak] {
display: none; display: none;

2
assets/css/style.css

File diff suppressed because one or more lines are too long

2
assets/css/style.css.map

File diff suppressed because one or more lines are too long

90
assets/css/style.less

@ -412,7 +412,7 @@ page {
} }
.coupon-list .item .money { .coupon-list .item .money {
background-image: url('https://h5.dayouqiantu.cn/static/images/coupon1.png'); background-image: url('https://h5.yixiang.co/static/images/coupon1.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 2.4*100rpx; width: 2.4*100rpx;
@ -425,7 +425,7 @@ page {
} }
.coupon-list .item .money.moneyGray { .coupon-list .item .money.moneyGray {
background-image: url('https://h5.dayouqiantu.cn/static/images/coupon2.png'); background-image: url('https://h5.yixiang.co/static/images/coupon2.png');
} }
.coupon-list .item .money .num { .coupon-list .item .money .num {
@ -1008,7 +1008,7 @@ page {
padding: 0 0.88*100rpx 0 0.55*100rpx; padding: 0 0.88*100rpx 0 0.55*100rpx;
font-size: 0.28*100rpx; font-size: 0.28*100rpx;
color: #fff; color: #fff;
background-image: url('https://h5.dayouqiantu.cn/static/images/transparent.png'); background-image: url('https://h5.yixiang.co/static/images/transparent.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
@ -1027,7 +1027,7 @@ page {
/*首页优惠券弹窗*/ /*首页优惠券弹窗*/
.coupon-window { .coupon-window {
background-image: url('https://h5.dayouqiantu.cn/static/images/coupon-window.png'); background-image: url('https://h5.yixiang.co/static/images/coupon-window.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 6.3*100rpx; width: 6.3*100rpx;
@ -1113,7 +1113,7 @@ page {
} }
.coupon-window .lid { .coupon-window .lid {
background-image: url('https://h5.dayouqiantu.cn/static/images/coupon-window2.png'); background-image: url('https://h5.yixiang.co/static/images/coupon-window2.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 5.73*100rpx; width: 5.73*100rpx;
@ -1520,7 +1520,7 @@ page {
.index .hotList .hot-bg { .index .hotList .hot-bg {
width: 100%; width: 100%;
height: 2.15*100rpx; height: 2.15*100rpx;
background-image: url('https://h5.dayouqiantu.cn/static/images/index-bg.png'); background-image: url('https://h5.yixiang.co/static/images/index-bg.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
padding: 0 0.3*100rpx; padding: 0 0.3*100rpx;
@ -3568,7 +3568,7 @@ page {
.personal-data .wrapper .wrapList .item.on { .personal-data .wrapper .wrapList .item.on {
border-color: #e93323; border-color: #e93323;
border-radius: 0.2*100rpx; border-radius: 0.2*100rpx;
background: url("https://h5.dayouqiantu.cn/static/images/figure.png") no-repeat; background: url("https://h5.yixiang.co/static/images/figure.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
background-color: #fff9f9; background-color: #fff9f9;
} }
@ -3782,27 +3782,27 @@ page {
} }
.member-center .header .slider-banner .swiper-slide.diamonds { .member-center .header .slider-banner .swiper-slide.diamonds {
background-image: url("https://h5.dayouqiantu.cn/static/images/diamonds.jpg"); background-image: url("https://h5.yixiang.co/static/images/diamonds.jpg");
} }
.member-center .header .slider-banner .swiper-slide.gold { .member-center .header .slider-banner .swiper-slide.gold {
background-image: url("https://h5.dayouqiantu.cn/static/images/gold.jpg"); background-image: url("https://h5.yixiang.co/static/images/gold.jpg");
} }
.member-center .header .slider-banner .swiper-slide.silver { .member-center .header .slider-banner .swiper-slide.silver {
background-image: url("https://h5.dayouqiantu.cn/static/images/silver.jpg"); background-image: url("https://h5.yixiang.co/static/images/silver.jpg");
} }
.member-center .header .slider-banner .swiper-slide.brass { .member-center .header .slider-banner .swiper-slide.brass {
background-image: url("https://h5.dayouqiantu.cn/static/images/brass.jpg"); background-image: url("https://h5.yixiang.co/static/images/brass.jpg");
} }
.member-center .header .slider-banner .swiper-slide.bronze { .member-center .header .slider-banner .swiper-slide.bronze {
background-image: url("https://h5.dayouqiantu.cn/static/images/bronze.jpg"); background-image: url("https://h5.yixiang.co/static/images/bronze.jpg");
} }
.member-center .header .slider-banner .swiper-slide.ordinary { .member-center .header .slider-banner .swiper-slide.ordinary {
background-image: url("https://h5.dayouqiantu.cn/static/images/ordinary.jpg"); background-image: url("https://h5.yixiang.co/static/images/ordinary.jpg");
} }
.member-center .header .slider-banner .swiper-slide image { .member-center .header .slider-banner .swiper-slide image {
@ -4011,7 +4011,7 @@ page {
/*积分详情*/ /*积分详情*/
.integral-details .header { .integral-details .header {
background-image: url('https://h5.dayouqiantu.cn/static/images/integralbg.jpg'); background-image: url('https://h5.yixiang.co/static/images/integralbg.jpg');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
@ -4306,7 +4306,7 @@ page {
} }
.bargain .header { .bargain .header {
/* background-image: url('https://h5.dayouqiantu.cn/static/images/cut1.png'); */ /* background-image: url('https://h5.yixiang.co/static/images/cut1.png'); */
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 6.98*100rpx; width: 6.98*100rpx;
@ -4317,7 +4317,7 @@ page {
} }
.bargain .header.on { .bargain .header.on {
background-image: url('https://h5.dayouqiantu.cn/static/images/cut2.png'); background-image: url('https://h5.yixiang.co/static/images/cut2.png');
} }
.bargain .header .pictxt { .bargain .header .pictxt {
@ -4344,7 +4344,7 @@ page {
} }
.bargain .header .time { .bargain .header .time {
background-image: url('https://h5.dayouqiantu.cn/static/images/time.png'); background-image: url('https://h5.yixiang.co/static/images/time.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 4.4*100rpx; width: 4.4*100rpx;
@ -4484,7 +4484,7 @@ page {
.bargain .wrapper .lock, .bargain .wrapper .lock,
.bargain .bargainGang .lock, .bargain .bargainGang .lock,
.bargain .goodsDetails .lock { .bargain .goodsDetails .lock {
background-image: url('https://h5.dayouqiantu.cn/static/images/lock.png'); background-image: url('https://h5.yixiang.co/static/images/lock.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 5.48*100rpx; width: 5.48*100rpx;
@ -5552,7 +5552,7 @@ page {
} }
.sign .wrapper .list .item .venus { .sign .wrapper .list .item .venus {
background-image: url('https://h5.dayouqiantu.cn/static/images/stars2.png'); background-image: url('https://h5.yixiang.co/static/images/stars2.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 0.56*100rpx; width: 0.56*100rpx;
@ -5561,11 +5561,11 @@ page {
} }
.sign .wrapper .list .item .venus.venusSelect { .sign .wrapper .list .item .venus.venusSelect {
background-image: url('https://h5.dayouqiantu.cn/static/images/stars1.png'); background-image: url('https://h5.yixiang.co/static/images/stars1.png');
} }
.sign .wrapper .list .item .venus.reward { .sign .wrapper .list .item .venus.reward {
background-image: url('https://h5.dayouqiantu.cn/static/images/stars3.png'); background-image: url('https://h5.yixiang.co/static/images/stars3.png');
width: 0.75*100rpx; width: 0.75*100rpx;
height: 0.56*100rpx; height: 0.56*100rpx;
} }
@ -5586,7 +5586,7 @@ page {
} }
.sign .wrapper .lock { .sign .wrapper .lock {
background-image: url('https://h5.dayouqiantu.cn/static/images/lock2.png'); background-image: url('https://h5.yixiang.co/static/images/lock2.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 5.58*100rpx; width: 5.58*100rpx;
@ -5623,7 +5623,7 @@ page {
text-align: center; text-align: center;
line-height: 1.16*100rpx; line-height: 1.16*100rpx;
margin-right: 0.19*100rpx; margin-right: 0.19*100rpx;
background-image: url('https://h5.dayouqiantu.cn/static/images/redBg.png'); background-image: url('https://h5.yixiang.co/static/images/redBg.png');
} }
.sign .wrapper2 .list2 .data { .sign .wrapper2 .list2 .data {
@ -5694,7 +5694,7 @@ page {
} }
.sign .signTip .signTipCon { .sign .signTip .signTipCon {
background-image: url('https://h5.dayouqiantu.cn/static/images/register.png'); background-image: url('https://h5.yixiang.co/static/images/register.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 4.2*100rpx; width: 4.2*100rpx;
@ -6427,7 +6427,7 @@ page {
/*我的推广*/ /*我的推广*/
.my-promotion .header { .my-promotion .header {
background-image: url("https://h5.dayouqiantu.cn/static/images/promotionBg.png"); background-image: url("https://h5.yixiang.co/static/images/promotionBg.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
@ -6531,7 +6531,7 @@ page {
} }
.my-account .wrapper .header .headerCon { .my-account .wrapper .header .headerCon {
background-image: url('https://h5.dayouqiantu.cn/static/images/accountBg.png'); background-image: url('https://h5.yixiang.co/static/images/accountBg.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100%; background-size: 100%;
height: 100%; height: 100%;
@ -6920,7 +6920,7 @@ page {
/*抢购详情页*/ /*抢购详情页*/
.product-con .nav { .product-con .nav {
box-sizing: border-box; box-sizing: border-box;
background-image: url('https://h5.dayouqiantu.cn/static/images/rushBuy.jpg'); background-image: url('https://h5.yixiang.co/static/images/rushBuy.jpg');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
@ -7241,7 +7241,7 @@ page {
} }
.register .shading { .register .shading {
background-image: url("https://h5.dayouqiantu.cn/static/images/registerw.png"); background-image: url("https://h5.yixiang.co/static/images/registerw.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
@ -7378,7 +7378,7 @@ page {
} }
.register .bottom { .register .bottom {
background-image: url("https://h5.dayouqiantu.cn/static/images/registerB.png"); background-image: url("https://h5.yixiang.co/static/images/registerB.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 6.2*100rpx; width: 6.2*100rpx;
@ -7662,7 +7662,7 @@ page {
} }
.priceChange .priceTitle { .priceChange .priceTitle {
background: url("https://h5.dayouqiantu.cn/static/images/pricetitle.jpg") no-repeat; background: url("https://h5.yixiang.co/static/images/pricetitle.jpg") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
height: 1.6*100rpx; height: 1.6*100rpx;
@ -8193,12 +8193,36 @@ page {
/*订单首页*/ /*订单首页*/
.order-index .header { .order-index .header {
box-sizing: border-box; box-sizing: border-box;
background: url("https://h5.dayouqiantu.cn/static/images/orderIndex.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
height: 3.02*100rpx; height: 3.02*100rpx;
padding: 0.45*100rpx 0.3*100rpx 0 0.3*100rpx; padding: 0.45*100rpx 0.3*100rpx 0 0.3*100rpx;
position: relative;
// background-color: #00c17b;
}
.order-index .image {
position: absolute;
width: 100%;
left: 0;
right: 0;
top: 0;
z-index: 0;
}
.order-index .header:after {
position: absolute;
left: 0;
right: 0;
bottom: -0.98*100rpx;
z-index: -1;
content: '';
height: 1*100rpx;
width: 100%;
border-radius: 0 0 50% 50%;
// background-color: #00c17b;
} }
.order-index .header .item { .order-index .header .item {
@ -8216,11 +8240,13 @@ page {
} }
.order-index .wrapper { .order-index .wrapper {
position: relative;
width: 6.9*100rpx; width: 6.9*100rpx;
background-color: #fff; background-color: #fff;
border-radius: 0.1*100rpx; border-radius: 0.1*100rpx;
margin: -1.15*100rpx auto 0 auto; margin: -1.15*100rpx auto 0 auto;
padding-top: 0.25*100rpx; padding-top: 0.25*100rpx;
z-index: 99;
} }
.order-index .wrapper .title { .order-index .wrapper .title {

1
pages/authorization/index.vue

@ -53,6 +53,7 @@ export default {
methods: { methods: {
...mapActions(["changeAuthorization", "setUserInfo"]), ...mapActions(["changeAuthorization", "setUserInfo"]),
...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]), ...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
back() { back() {
this.$yrouter.switchTab({ this.$yrouter.switchTab({
path: "/pages/home/index", path: "/pages/home/index",

19
pages/orderAdmin/OrderIndex/index.vue

@ -1,5 +1,6 @@
<template> <template>
<view class="order-index" ref="container"> <view class="order-index" ref="container">
<image src="@/static/images/orderIndex.png" mode="widthFix" class="image" />
<view class="header acea-row"> <view class="header acea-row">
<view class="item" @click="goAdminOrderList(0)"> <view class="item" @click="goAdminOrderList(0)">
<view class="num">{{ census.orderCount.unpaidCount }}</view> <view class="num">{{ census.orderCount.unpaidCount }}</view>
@ -130,10 +131,11 @@ export default {
}, },
err => { err => {
uni.showToast({ uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message, title:
icon: 'none', err.msg || err.response.data.msg || err.response.data.message,
duration: 2000 icon: "none",
}); duration: 2000
});
} }
); );
}, },
@ -150,10 +152,11 @@ export default {
}, },
err => { err => {
uni.showToast({ uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message, title:
icon: 'none', err.msg || err.response.data.msg || err.response.data.message,
duration: 2000 icon: "none",
}); duration: 2000
});
}, },
300 300
); );

BIN
static/images/orderIndex.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 22 KiB

53
utils/index.js

@ -151,7 +151,9 @@ export const authorize = (authorizeStr) => {
} }
export const login = () => { export const login = () => {
console.log('开始登录 ————————————————————') console.log('————————————————————')
console.log('开始登录')
console.log('————————————————————')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log('获取环境商') console.log('获取环境商')
getProvider().then(provider => { getProvider().then(provider => {
@ -411,21 +413,37 @@ export const handleLoginStatus = (location, complete, fail, success) => {
export function routerPermissions(url, type) { export function routerPermissions(url, type) {
console.log('routerPermissions', url) console.log('routerPermissions', url)
console.log('————————')
console.log(url, type, 'routerPermissions')
console.log('————————')
let path = url let path = url
if (!path) { if (!path) {
path = '/'+getCurrentPageUrlWithArgs() path = '/'+getCurrentPageUrlWithArgs()
} }
if (Vue.prototype.$deviceType == 'routine') { if (Vue.prototype.$deviceType == 'routine') {
console.log('————————')
console.log('当前是微信小程序,开始处理小程序登录方法') console.log('当前是微信小程序,开始处理小程序登录方法')
console.log('————————')
// 如果是微信小程序,跳转到授权页 // 如果是微信小程序,跳转到授权页
// 先校验用户是否授权,如果授权了,进行自动登录 // 先校验用户是否授权,如果授权了,进行自动登录
console.log('————————')
console.log('开始校验权限')
console.log('————————')
authorize('userInfo').then(() => { authorize('userInfo').then(() => {
// 自动登录 // 自动登录
console.log('————————')
console.log('自动登录')
console.log('————————')
login().then(res => { login().then(res => {
// 登录成功,跳转到需要跳转的页面 // 登录成功,跳转到需要跳转的页面
console.log('登录成功,跳转页面', type) console.log('————————')
console.log('登录成功,跳转页面')
console.log('————————')
store.commit("UPDATE_AUTHORIZATIONPAGE", false); store.commit("UPDATE_AUTHORIZATIONPAGE", false);
if (path == '/pages/shop/ShoppingCart/index' || path == '/pages/user/User/index') { if (path == '/pages/shop/ShoppingCart/index' || path == '/pages/user/User/index') {
console.log('————————')
console.log('当前是购物车,或者个人中心')
console.log('————————')
return return
} }
if (type == 'reLaunch') { if (type == 'reLaunch') {
@ -447,6 +465,9 @@ export function routerPermissions(url, type) {
}) })
} }
}).catch(error => { }).catch(error => {
console.log('————————')
console.log('自动登录失败,跳转到授权页面')
console.log('————————')
uni.showToast({ uni.showToast({
title: error, title: error,
icon: "none", icon: "none",
@ -692,25 +713,35 @@ export const PosterCanvas = (store, successCallBack) => {
export const handleLoginFailure = () => { export const handleLoginFailure = () => {
console.log('————————')
console.log('退出登录,标记当前页面为授权页面,防止多次跳转')
console.log('————————')
store.commit("LOGOUT"); store.commit("LOGOUT");
store.commit("UPDATE_AUTHORIZATION", false); store.commit("UPDATE_AUTHORIZATION", false);
// token 失效 // token 失效
// 判断当前是不是已经在登录页面或者授权页,防止二次跳转 // 判断当前是不是已经在登录页面或者授权页,防止二次跳转
if (store.getters.isAuthorizationPage || getCurrentPageUrl() == '/pages/user/Login/index') { if (store.getters.isAuthorizationPage || getCurrentPageUrl() == '/pages/user/Login/index') {
console.log('已经是登录页面或者授权页面,跳出方法') console.log(store.getters.isAuthorizationPage, getCurrentPageUrl(), '已经是登录页面或者授权页面,跳出方法')
return return
} }
console.log('————————')
console.log('当前是授权页面') console.log('当前是授权页面')
console.log(store.getters) console.log(store.getters)
console.log('————————')
store.commit("UPDATE_AUTHORIZATIONPAGE", true); store.commit("UPDATE_AUTHORIZATIONPAGE", true);
let path = '/'+getCurrentPageUrlWithArgs() let path = '/'+getCurrentPageUrlWithArgs()
// 判断是不是拼团进来的 // 判断是不是拼团进来的
if (getCurrentPageUrl() == 'pages/activity/GroupRule/index' && handleQrCode()) { if (getCurrentPageUrl() == 'pages/activity/GroupRule/index' && handleQrCode()) {
console.log('————————')
console.log('是拼团进来的') console.log('是拼团进来的')
console.log('————————')
let url = handleQrCode(); let url = handleQrCode();
console.log(url) console.log(url)
if (url) { if (url) {
@ -722,14 +753,18 @@ export const handleLoginFailure = () => {
}) })
// cookie.set("spread", url.spread || 0); // cookie.set("spread", url.spread || 0);
} else { } else {
console.log('————————')
console.log('是拼团进来的,但是没有获取到参数') console.log('是拼团进来的,但是没有获取到参数')
console.log('————————')
handleNoParameters() handleNoParameters()
} }
} }
// 判断是不是扫描的砍价海报进来的 // 判断是不是扫描的砍价海报进来的
if (getCurrentPageUrl() == 'pages/activity/DargainDetails/index' && handleQrCode()) { if (getCurrentPageUrl() == 'pages/activity/DargainDetails/index' && handleQrCode()) {
console.log('————————')
console.log('是扫描的砍价海报进来的') console.log('是扫描的砍价海报进来的')
console.log('————————')
let url = handleQrCode(); let url = handleQrCode();
if (url) { if (url) {
path = parseUrl({ path = parseUrl({
@ -742,13 +777,19 @@ export const handleLoginFailure = () => {
// cookie.set("spread", url.spread || 0); // cookie.set("spread", url.spread || 0);
} else { } else {
handleNoParameters() handleNoParameters()
console.log('————————')
console.log('是扫描的砍价海报进来的,但是没有获取到参数') console.log('是扫描的砍价海报进来的,但是没有获取到参数')
console.log('————————')
} }
} }
if (getCurrentPageUrl() == 'pages/shop/GoodsCon/index' && handleQrCode()) { if (getCurrentPageUrl() == 'pages/shop/GoodsCon/index' && handleQrCode()) {
console.log('————————')
console.log('是扫描的商品详情') console.log('是扫描的商品详情')
console.log('————————')
let url = handleQrCode(); let url = handleQrCode();
console.log(url) console.log(url)
if (url) { if (url) {
@ -761,12 +802,16 @@ export const handleLoginFailure = () => {
cookie.set("spread", url.spread || 0); cookie.set("spread", url.spread || 0);
} else { } else {
handleNoParameters() handleNoParameters()
console.log('————————')
console.log('是扫描的商品详情进来的,但是没有获取到参数') console.log('是扫描的商品详情进来的,但是没有获取到参数')
console.log('————————')
} }
} }
console.log('————————')
console.log(path, '重定向页面地址')
console.log('————————')
routerPermissions(path, 'reLaunch') routerPermissions(path, 'reLaunch')
} }

6
utils/request.js

@ -16,10 +16,16 @@ fly.interceptors.response.use(
}, },
error => { error => {
if (error.toString() == 'Error: Network Error') { if (error.toString() == 'Error: Network Error') {
console.log('————————')
console.log('发送请求失败', error)
console.log('————————')
handleLoginFailure(); handleLoginFailure();
return Promise.reject({ msg: "未登录", toLogin: true }); return Promise.reject({ msg: "未登录", toLogin: true });
} }
if (error.status == 401) { if (error.status == 401) {
console.log('————————')
console.log('登录失效 401', error)
console.log('————————')
handleLoginFailure(); handleLoginFailure();
return Promise.reject({ msg: "未登录", toLogin: true }); return Promise.reject({ msg: "未登录", toLogin: true });
} }

Loading…
Cancel
Save