Merge remote-tracking branch 'origin/developerB' into developerB

src/main/java/com/caimei/www/controller/unlimited/WeChatController.java

@@ -0,0 +1,23 @@
+package com.caimei.www.controller.unlimited;
+
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2020/9/27
+ */
+public class WeChatController {
+	private static final String REDIRECT_URI = "we_chat/redirect_uri";
+    /**
+     * 微信授权页面路径
+     * @param model
+     * @return
+     */
+    @GetMapping("/we_chat/redirect_uri.html")
+    public String redirectUri(final Model model) {
+        return REDIRECT_URI;
+    }
+}

src/main/resources/static/css/base/center.css

@@ -4,7 +4,7 @@
  */
 @media screen and (min-width:768px){
     .navLayout {min-height: 900px;}
-    .crumbs{padding-left: 220px;}
+    .crumbs{padding-left: 240px;}
     .navLayout .left{float:left;width:200px;line-height:50px;white-space:nowrap;text-indent:16px;font-size:16px;background:#FFF}
     .navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5}
     .navLayout .navList .tab{display:block;color:#22272e;position:relative;cursor: pointer;}

src/main/resources/static/css/base/form.css

@@ -51,7 +51,7 @@
 .formLine .diyBox i:before{position:absolute;right:0;bottom:0;display:none;width:20px;height:20px;background-position:-208px -253px}
 .formLine .diyBox input:checked + i{border-color:#e15616;color:#e15616}
 .formLine .diyBox input:checked + i:before{display:block}
-.formLine textarea{margin: 0}
+
 
 
 

src/main/resources/static/css/supplier-center/dashboard.css

@@ -1,4 +1,5 @@
  @media screen and (min-width:768px) {
+     .crumbs{color: #22272e;font-size: 16px;}
      .pageContent {background: #FFF;padding: 16px}
      .pageContent form {width: 498px;margin: 0 auto;padding: 50px 0;}
      /**/
@@ -54,7 +55,7 @@
      .icon.rank:before {position: absolute;width: 60px;height: 60px;}
      .confirm span {color: #e15616;padding: 5px}
      .Statistics {margin-top: 20px;}
-     .Stati_top p {font-size: 14px;color: #333333;display: inline-block;}
+     .Stati_top p {font-size: 16px;color: #333333;display: inline-block;}
      .Stati_top span {font-size: 12px;color: #999999;}
      #StatisticsEacths {width: 968px;height: 440px;box-sizing: border-box;background: #FFF;padding:20px 0;margin-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
  }

src/main/resources/static/css/supplier-center/setting/information.css

@@ -1,6 +1,6 @@
 @media screen and (min-width:768px){
    .crumbs{color: #22272e;font-size: 16px;}
-   .head-wrap{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+   .head-wrap{background: #fff;border-bottom: 1px solid #e2e7ef}
    .head-top{height: 60px;line-height: 60px;color: #9aa5b5;margin: auto;width: fit-content}
    .head-top div{display: inline-block;cursor: pointer}
    .head-top div:nth-child(2){margin: 0 57px;}
@@ -8,7 +8,7 @@
     text-align: center;position: relative;top: 0px;right: 5px}
    .header-tabs.current{color: #e15616}
    .header-tabs .line.linestyle{color: #fff;background: #e15616}
-   .container{background: #fff;box-shadow: 0px 3px 6px 5px rgba(34, 39, 46, 0.07); padding-top: 19px}
+   .container{background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); padding-top: 19px}
    .container .forget-form{width: 500px; margin: 0 auto;padding: 20px 0}
    .formLine select[name="cityID"]{margin: 0 14px}
    .formLine p{color: #627386;padding-left: 12px}

src/main/resources/static/css/supplier-center/setting/password.css

@@ -17,6 +17,7 @@ li{list-style:none}
     .container{width: 100%;min-height:485px;box-sizing: border-box;padding: 16px 236px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .formLine p{color: #627386}
     input::placeholder{color: #9aa5b5;}
+    .formLine .showPwd{right: 8px}
 }
 
 /**

src/main/resources/static/css/supplier-center/shop/brand.css

@@ -12,6 +12,7 @@
   .addBrand{border: solid 1px #e15616;width: 128px;color: #e15616;background: #ffe6dc}
   .brand-list{padding:0 20px 30px 20px; background: #fff; margin-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
   .brand-title li{list-style: none;display: inline-block;color: #627386;width: 11%;text-align: center}
+  .brand-title li:last-child{width: 14%}
   .brand-title li:first-child{text-align: left}
   .brand-title li:nth-child(3){width: 15%}
   .brand-title li:nth-child(4){width: 30%}

src/main/resources/static/css/supplier-center/shop/goods.css

@@ -34,10 +34,8 @@ li{list-style: none}
   .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
   .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
   .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 112px}
-  .goods-main  .tbody .good-handle{padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
-  .goods-main  .tbody .btn{width: 52px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
-  .goods-main .tbody .success,.goods-main .tbody .danger{width: 88px}
-  .goods-main .tbody .primary{width: 62px}
+  .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
+  .goods-main  .tbody .btn{padding: 0 11px;margin-right: 8px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
   .goods-container .good-footer{width: 100%;height: 56px;float: left;padding: 10px 0;}
   .goods-container .good-footer .footer-left{float: left;margin-left: 20px}
   .goods-container .good-footer .checkbox {line-height: 36px;}

src/main/resources/static/css/user-center/repair/list.css

@@ -26,10 +26,10 @@ li{list-style:none}
     .order-header .header-bt .header-button .btn-server{width: 90px;height: 36px;display: block;background-color: #e15616;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #FFFFFF;line-height: 36px;text-align: center;}
     .container{width: 100%;margin-top: 15px;}
     .container .empty{background-color:#FFF;}
-    .container .section{width: 100%;height: 411px;padding-bottom: 16px;box-sizing: border-box;padding: 0 16px;background-color: #FFFFFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .container .section{width: 100%;box-sizing: border-box;padding: 0 16px 16px 16px;background-color: #FFFFFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .container .section .title{width: 100%;height: 54px;border-bottom: 1px solid #e2e7ef;}
     .container .section .content{width: 100%;height: auto;}
-    .container .section .list{width: 100%;height: 44px;}
+    .container .section .list{width: 100%;height: 44px;overflow: hidden;}
     .container .section .td{height: 54px;font-size: 14px;color:#22272e;float: left;line-height:54px;text-align: left;}
     .container .section .td.td-1{width:11%;}
     .container .section .td.td-2{width:14%;text-align: center;}

src/main/resources/static/js/base.js

@@ -1,5 +1,18 @@
 var spiServer = $("#spiServer").val();
 var isPC = ($(window).width()>768);
+var userAgent = navigator.userAgent.toLowerCase();
+var isWeChatBrowser = (userAgent.match(/MicroMessenger/i) === 'micromessenger');
+if (isWeChatBrowser) {
+    // 微信浏览器自动授权登录
+    var urlForCurrent = window.location.href;
+    var urlForWeChat = 'https://www.caimei365.com/we_chat/redirect_uri.html';
+    $.get(spiServer+'/user/authorizationLink?redirectUri='+urlForWeChat, function(r){
+        if(r.code===0 && r.data){
+            sessionStorage.setItem("urlForCurrent", urlForCurrent);
+            window.location.href = r.data;
+        }
+    });
+}
 var globalUserData = '';
 var GLOBAL_TOKEN = 'X-Token';
 var GLOBAL_USER_ID = 0;

src/main/resources/static/js/supplier-center/shop/goods.js

@@ -23,7 +23,6 @@ var myGoods = new Vue({
             smallTypeID:0,//二级
             tinyTypeID:0//三级
         },
-        classFlyInfoArr:[{name:'全部',value:''}],
         classificationFirstList:[],
         classificationTwoList:[],
         classificationThreeList:[],
@@ -31,7 +30,7 @@ var myGoods = new Vue({
         checkList:[],
         isCheckedAll:false,
         noMore:false,
-        isRequset:false
+        check:false,
     },
     computed: {
         pageTotal: function () {
@@ -143,7 +142,6 @@ var myGoods = new Vue({
         GetThreeClassFn: function(value){//获取三级分类菜单
             var _this = this;
             PublicApi.GetThreeClassFication({smallTypeId:value},function (response) {
-            console.log(response,'三级分类')
                 if(response.code==0){
                   if(response.data.length>0){
                         _this.classificationThreeList = response.data;
@@ -283,7 +281,9 @@ var myGoods = new Vue({
             location.href ='/supplier/release.html?productID='+pros.productID+'&type=edit';
         },
         ischeck: function(pros){//为未选中的时候改变为true，反之为true
+            var _this = this;
             pros.productsChecked = !pros.productsChecked;
+            _this.check = ! _this.check;
             this.updateCheckAllBtn();
         },
         updateCheckAllBtn: function() {// 全选勾选判断

src/main/resources/static/js/user-center/repair/detail.js

@@ -8,7 +8,7 @@ var repairDetailPage = new Vue({
         info:{},
         params:{
              id:'',
-             solveStatus:'',// 0未解决 1 已解决
+             solveStatus:1,// 0未解决 1 已解决
              serviceRating:'',//服务频分
              serviceEvaluate:'',//服务频率
         },
@@ -27,7 +27,10 @@ var repairDetailPage = new Vue({
             }else {
                  RepairApi.evaluation(_this.params,function (res) {
                     if (res.code==0){
-                        CAIMEI.dialog('提交成功')
+                        CAIMEI.dialog('提交成功');
+                        location.reload();
+                    }else {
+                       CAIMEI.Alert(response.msg,'确定',false);
                     }
                })
             }

src/main/resources/templates/supplier-center/dashboard.html

@@ -16,7 +16,9 @@
 <div id="dashboard">
     <div class="navLayout" v-cloak>
         <div v-if="isPC" class="crumbs">
-            <span>我的采美</span>
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的首页</span>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->

src/main/resources/templates/supplier-center/shop/goods.html

@@ -146,15 +146,15 @@
                                         <a class="btn " href="javascript: void(0);"
                                            v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1"
                                            @click="editGoodFn(product)">编辑</a>
-                                        <a class="btn " href="javascript: void(0);"
-                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
-                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
-                                           @click="AddPushHotFn(product)">添加主页推荐</a>
-                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
-                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
-                                        <a class="btn primary" href="javascript: void(0);"
+                                            <a class="btn primary" href="javascript: void(0);"
                                            v-if="['1','2'].indexOf(product.validFlag)!=-1"
                                            @click="pageLinkDetils(product)">预览商品</a>
+                                           <a class="btn " href="javascript: void(0);"
+                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                           <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
+                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                           <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
+                                           @click="AddPushHotFn(product)">添加主页推荐</a>
                                     </div>
                                 </li>
                             </ul>
@@ -244,7 +244,7 @@
                         </div>
                         <div class="footer-right">
                             <a href="javascript:void(0);" class="btn batch"
-                               :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']" @click="ItemDownshelfAll">批量下架</a>
+                               :class="[isCheckedAll ||check? 'icon-gouxuan' : 'icon-weigouxuan']" @click="ItemDownshelfAll">批量下架</a>
                         </div>
                     </div>
                 </div>

src/main/resources/templates/user-center/repair/detail.html

@@ -67,7 +67,7 @@
                             <p><em>*</em>联系电话：<span>{{info.userMobile}}</span></p>
                             <p><em>*</em>联系地址：<span>{{info.provinceName}}{{info.cityName}}{{info.townName}}{{info.userAddress}}</span></p>
                             <p class="Image">仪器图片：
-                              <span><img v-for="item in  info.instrumentArr" v-if="info.instrumentArr!=null" :src="item"/></span>
+                              <span v-if="info.instrumentArr!=null"><img v-for="item in  info.instrumentArr"  :src="item"/></span>
                             </p>
                             <p><em>*</em>问题描述：<span>{{info.problemDescription}}</span></p>
                             <p><em>*</em>仪器名称品牌/型号：<span>{{info.instrumentBrand}}</span></p>

src/main/resources/templates/we_chat/redirect_uri.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <meta charset="UTF-8">
+    <title>微信授权</title>
+</head>
+<body>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript">
+    // 如果用户同意授权，页面将跳转至 redirect_uri/?code=CODE&state=STATE
+    var wx_code = getUrlParam('code');
+    var wx_state = getUrlParam('state');
+    $.get(spiServer+'/user/authorizationLogin?code='+wx_code+'&state='+wx_state, function(r){
+        if(r.code===0){
+            window.location.href = sessionStorage.getItem("urlForCurrent");
+        }else{
+            alert(r.msg);
+        }
+    });
+</script>
+</body>
+</html>