!106 2022-1-25 Leung

Merge pull request !106 from Admin/sit-Leung

rc-busness/assets/css/global.less

@@ -328,7 +328,7 @@ picture {
 	height: auto;
 	position: fixed;
 	right: 0;
-	top: 40%;
+	top: 56vh;
 	background: #FFFFFF;
 	box-shadow: 0 0 10px rgba(0, 0, 0, 0.16);
 	border-radius: .25rem;

rc-busness/assets/css/search.less

@@ -341,6 +341,7 @@ border-radius: 100px;
       font-size: 18px;
       color: #333333;
       font-weight: bold;
+	  margin-top:1rem;
     }
     .ts-scrollable{
       margin-top: 1rem;

rc-busness/pages/personal/discount.vue

@@ -34,7 +34,7 @@
 						￥
 					</i>
 					<span>
-						{{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}}
+						{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
 					</span>
                 </div>
                 <strong>{{ item.couponName }}</strong>

rc-busness/pages/personal/settlement.less

@@ -426,7 +426,7 @@ ul li ol li em strong i {
             display: flex;
             justify-content: flex-end;
             flex-direction: column;
-            align-items: self-end;
+            align-items: flex-end;
 			text-align: right;
             i {
                 font-style: normal;
@@ -440,7 +440,7 @@ ul li ol li em strong i {
                 color: #e1001a;
                 font-size: 26px;
 				display:inline-block;
-				width:5rem;
+				min-width:6rem;
             }
 			
 			.discountInfo {

rc-busness/pages/personal/settlement.vue

@@ -167,7 +167,7 @@
 						￥
 					</i>
 					<span>
-						{{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}}
+						{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
 					</span>
 				</div>
 				<strong>{{ item.couponName }}</strong>

rc-busness/pages/personal/userpay.vue

@@ -64,7 +64,9 @@
         <p>您的商品我们正在抓紧打包，请耐心等候！</p>
         <div class="line_dashed"></div>
         <div class="userer">
-           <div class="qrcode"><vue-qr  :text="qrtext" :size="260"></vue-qr></div>
+           <div class="qrcode">
+			   <img src="/images/qrcode-aichong.jpg">
+		   </div>
           <p>微信扫一扫，识别二维码</p>
           <p class="tips">加入社群0元试用商品随单发放</p>
         </div>
@@ -94,7 +96,7 @@ export default {
       activeIndex: 0,
 	  paymentTimer:undefined,
       isSucess: false,
-	  dialogSuccess: false,
+	  dialogSuccess: true,
       paytype: "微信",
       userpaystype: [
         {

rc-busness/pages/productdetails/producted.vue

@@ -4,7 +4,7 @@
       <Myheader></Myheader>
       <div class="rc-top"></div>
       <tabs :crumbs="crumbs"></tabs>
-      <div class="online" id="fixed-catbar-seperator rc-margin--none"></div>
+      <div class="online rc-margin--none" id="fixed-catbar-seperator"></div>
       <div class="rc-top"></div>
       <div
         class="
@@ -187,7 +187,7 @@
                     <li>
                       <span
                         ><i class="ts-row-title">商品编号：</i
-                        ><i>{{ curItem.brandCode }}</i></span
+                        ><i>{{ curItem.productCode }}</i></span
                       >
                     </li>
                   </ul>
@@ -224,7 +224,7 @@
 		  			￥
 		  		</i>
 		  		<span>
-		  			{{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}}
+		  			{{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
 		  		</span>
 		  	</div>
 		  	<strong>{{ item.couponName }}</strong>
@@ -593,6 +593,8 @@ export default {
       // let userid=JSON.parse(location.getItem('userInfo'));
       // let mobile=JSON.parse(location.getItem('userInfo'));
       // console.log(userid,mobile);
+	  let basePoint = item.basePoint;
+	  basePoint = basePoint?basePoint:0;
       let data = await postCourseId(
         item.productCode,
         this.sales_num,
@@ -603,7 +605,7 @@ export default {
         item.ecPrice,
         item.specifications,
         item.leftAllotment,
-		item.basePoint
+		basePoint
       );
       if (data) {
         this.productlist = data;

rc-busness/pages/productdetails/productlist.vue

@@ -110,7 +110,7 @@
               </div>
               <div class="rc-column">
                 <div class="rc-click" @click="selectproduce(item)">
-                  <span>{{ item.categoryName }}</span>
+                  <span>{{ item.name }}</span>
                   <i>{{ item.ecPrice?("￥"+item.ecPrice):'' }}</i>
                 </div>
                 <strong