dos

Application/Common/Conf/config.php

@@ -13,7 +13,7 @@ return array(
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
-   '__CDN__' => 'https://static3.izhida.cn/cdn1/nex3s-avatar/v1.1.1',
+   '__CDN__' => 'https://static3.izhida.cn/cdn1/nex3s-avatar/v1.1.2',
     // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     'URL_MODEL' => 3,
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',

Public/static/css/main.min.css

-<<<<<<< HEAD
-body{margin:0;padding:0}.hide{display:none;}.page{width:32rem;height:61.9rem;position:relative;display:none;overflow:hidden;margin:0 auto;}.page-2054{display:block}input,textarea,img{border:0;top:0;left:0;width:100%;height:100%;margin:0;padding:0;}input,textarea{background:transparent;}input[type=file]{opacity:0;}.res-28150{position:absolute;left:7.05rem;top:20.45rem;width:18rem;height:18rem;}.res-28144{position:absolute;opacity:1;left:11.4rem;top:39.25rem;width:9.2rem;height:1.45rem;background: url(../images/5408_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28143{position:absolute;opacity:1;left:9.3rem;top:49.5rem;width:13.5rem;height:3.25rem;background: url(../images/5971_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28152{position:absolute;opacity:1;left:0rem;top:7.75rem;width:32rem;height:7.75rem;background: url(../images/7699_1583299843.png)left top no-repeat;background-size:100% 100%;}.res-28142{position:absolute;opacity:1;left:9.3rem;top:49.5rem;width:13.5rem;height:3.25rem;background: url(../images/6532_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28149{position:absolute;opacity:1;left:7.05rem;top:20.45rem;width:18rem;height:18rem;background: url(../images/782_1583247415.png)left top no-repeat;background-size:100% 100%;}.res-28140{position:absolute;opacity:1;left:6.4rem;top:45.25rem;width:19.3rem;height:2.1rem;background: url(../images/6793_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28151{position:absolute;opacity:1;left:0rem;top:0rem;width:32rem;height:61.9rem;background: url(../images/1293_1583298317.jpg)left top no-repeat;background-size:100% 100%;}
-=======
-body{margin:0;padding:0}.hide{display:none;}.page{width:32rem;height:61.9rem;position:relative;display:none;overflow:hidden;margin:0 auto;}.page-2054{display:block}input,textarea,img{border:0;top:0;left:0;width:100%;height:100%;margin:0;padding:0;}input,textarea{background:transparent;}input[type=file]{opacity:0;}.res-28150{position:absolute;left:7.05rem;top:20.45rem;width:18rem;height:18rem;}.res-28144{position:absolute;opacity:1;left:11.4rem;top:39.25rem;width:9.2rem;height:1.45rem;background: url(../images/5408_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28143{position:absolute;opacity:1;left:9.3rem;top:49.5rem;width:13.5rem;height:3.25rem;background: url(../images/5971_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28155{position:absolute;opacity:1;left:0rem;top:7.75rem;width:32rem;height:5.8rem;background: url(../images/5839_1583306284.png)left top no-repeat;background-size:100% 100%;}.res-28142{position:absolute;opacity:1;left:9.3rem;top:49.5rem;width:13.5rem;height:3.25rem;background: url(../images/6532_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28149{position:absolute;opacity:1;left:7.05rem;top:20.45rem;width:18rem;height:18rem;background: url(../images/782_1583247415.png)left top no-repeat;background-size:100% 100%;}.res-28140{position:absolute;opacity:1;left:6.4rem;top:45.25rem;width:19.3rem;height:2.1rem;background: url(../images/6793_1583242424.png)left top no-repeat;background-size:100% 100%;}.res-28153{position:absolute;opacity:1;left:0rem;top:0rem;width:32.05rem;height:61.9rem;background: url(../images/1651_1583304165.jpg)left top no-repeat;background-size:100% 100%;}
->>>>>>> master
+body {
+  margin: 0;
+  padding: 0
+}
+
+.hide {
+  display: none;
+}
+
+.page {
+  width: 32rem;
+  height: 61.9rem;
+  position: relative;
+  display: none;
+  overflow: hidden;
+  margin: 0 auto;
+}
+
+.page-2054 {
+  display: block
+}
+
+input,
+textarea,
+img {
+  border: 0;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+
+input,
+textarea {
+  background: transparent;
+}
+
+input[type=file] {
+  opacity: 0;
+}
+
+.res-28150 {
+  position: absolute;
+  left: 7.05rem;
+  top: 20.45rem;
+  width: 18rem;
+  height: 18rem;
+}
+
+.res-28144 {
+  position: absolute;
+  opacity: 1;
+  left: 11.4rem;
+  top: 39.25rem;
+  width: 9.2rem;
+  height: 1.45rem;
+  background: url(../images/5408_1583242424.png)left top no-repeat;
+  background-size: 100% 100%;
+}
+
+.res-28143 {
+  position: absolute;
+  opacity: 1;
+  left: 9.3rem;
+  top: 49.5rem;
+  width: 13.5rem;
+  height: 3.25rem;
+  background: url(../images/5971_1583242424.png)left top no-repeat;
+  background-size: 100% 100%;
+}
+
+.res-28155 {
+  position: absolute;
+  opacity: 1;
+  left: 0rem;
+  top: 7.75rem;
+  width: 32rem;
+  height: 5.8rem;
+  background: url(../images/5839_1583306284.png)left top no-repeat;
+  background-size: 100% 100%;
+}
+
+.res-28142 {
+  position: absolute;
+  opacity: 1;
+  left: 9.3rem;
+  top: 49.5rem;
+  width: 13.5rem;
+  height: 3.25rem;
+  background: url(../images/6532_1583242424.png)left top no-repeat;
+  background-size: 100% 100%;
+}
+
+.res-28149 {
+  position: absolute;
+  opacity: 1;
+  left: 7.05rem;
+  top: 20.45rem;
+  width: 18rem;
+  height: 18rem;
+  background: url(../images/782_1583247415.png)left top no-repeat;
+  background-size: 100% 100%;
+}
+
+.res-28140 {
+  position: absolute;
+  opacity: 1;
+  left: 6.4rem;
+  top: 45.25rem;
+  width: 19.3rem;
+  height: 2.1rem;
+  background: url(../images/6793_1583242424.png)left top no-repeat;
+  background-size: 100% 100%;
+}
+
+.res-28153 {
+  position: absolute;
+  opacity: 1;
+  left: 0rem;
+  top: 0rem;
+  width: 32.05rem;
+  height: 61.9rem;
+  background: url(../images/1651_1583304165.jpg)left top no-repeat;
+  background-size: 100% 100%;
+}
\ No newline at end of file