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

src/main/resources/static/js/equipment/detail.js

@@ -34,3 +34,11 @@ var equipmentDetail = new Vue({
         });
     }
 });
+//分项二维码
+$(function () {
+    $('.share .code').qrcode({
+        width: 120,
+        height: 120,
+        text: window.location.href
+    });
+});

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

@@ -21,9 +21,9 @@ var repairDetailPage = new Vue({
         submit:function(){ //提交评论
             var _this = this;
             if( _this.params.serviceRating==0){
-                CAIMEI.Alert('必填项不能为空','确定')
+                CAIMEI.Alert('请评价服务态度','确定')
             }else if( _this.params.serviceEvaluate==''){
-                CAIMEI.Alert('请输入评论','确定')
+                CAIMEI.Alert('请输入具体评价','确定')
             }else {
                  RepairApi.evaluation(params,function (res) {
                     if (res.code==0){

src/main/resources/templates/equipment/detail.html

@@ -29,8 +29,10 @@
                 <p class="row" th:each="item,status : ${equipment.pageContents}" th:if="${item.type}==2 and ${status.index}>4">
                     <span class="l" th:text="${item.name}"></span><i>：</i><em th:text="${item.content}"></em>
                 </p>
-                <a href="javascript:void(0);" class="share">分享<i class="icon"></i></a>
-                <a href="javascript:void(0);" class="buy">点击购买</a>
+                <a href="javascript:void(0);" class="share" title="手机扫一扫分享">分享<i class="icon"></i>
+                <div class="code"></div>
+                </a>
+<!--                <a href="javascript:void(0);" class="buy">点击购买</a>-->
             </div>
         </div>
     </div>
@@ -76,6 +78,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery.qrcode.min.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/equipment/detail.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -60,7 +60,7 @@
                 <div class="sencondCont">
                     <form>
                          <div>
-                            <p><em>*</em>维修订单号：<span>{{info.orderNo}}"</span></p>
+                            <p><em>*</em>维修订单号：<span>{{info.orderNo}}</span></p>
                             <p><em>*</em>仪器名称：<span>{{info.instrumentName}}</span></p>
                             <p><em>*</em>生产厂家：<span>{{info.manufacturer}}</span></p>
                             <p><em>*</em>联系人：<span>{{info.userContact}}</span></p>