Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

src/App.vue

@@ -146,8 +146,8 @@ export default {
       if (AnalysysAgent) {
         let profile = vm.$u.deepClone(vm.userInfo)
         profile.token = vm.vuex_token
-        profile.openid = vm.openId
-        profile.orgid = vm.orgId
+        profile.openId = vm.openId
+        profile.orgId = vm.orgId
         AnalysysAgent.profileSet(profile)
       }
     },
@@ -155,13 +155,13 @@ export default {
       if (AnalysysAgent) {
         let user = vm.$u.deepClone(vm.userInfo)
         user.token = vm.vuex_token
-        user.openid = vm.openId
+        user.openId = vm.openId
         // 用户id设置
         AnalysysAgent.alias(user.openid + '')
         // 用户附加属性
         let profile = {
           userfrom: '模考大师',
-          openid: user.openid,
+          openId: user.openid,
           nickName: user.nickName
         }
         Object.keys(profile).map((key) => {

src/pages/cert/detailLearn.vue

@@ -18,32 +18,32 @@
             </view>
             <view v-if="type == 'learn'" class="item" style="margin-top: 30rpx;">
               <view class="table">
-                <u-table border-color="#9EA5BB">
-                  <u-tr class="u-tr">
-                    <u-td class="u-td bg-td">姓名</u-td>
-                    <u-td class="u-td val-td">{{name}}</u-td>
-                  </u-tr>
-                  <u-tr class="u-tr">
-                    <u-td class="u-td bg-td">身份证号</u-td></u-td>
-                    <u-td class="u-td val-td">{{idCard}}</u-td>
-                  </u-tr>
-                  <u-tr class="u-tr">
-                    <u-td class="u-td bg-td">工作单位</u-td>
-                    <u-td class="u-td val-td">{{company}}</u-td>
-                  </u-tr>
-                  <u-tr class="u-tr">
-                    <u-td class="u-td bg-td">资格类型</u-td>
-                    <u-td class="u-td val-td">{{subjectName}}</u-td>
-                  </u-tr>
-                  <u-tr class="u-tr">
-                    <u-td class="u-td bg-td">培训机构</u-td>
-                    <u-td class="u-td val-td">{{institutionName}}</u-td>
-                  </u-tr>
-                  <u-tr class="u-tr">
-                    <u-td class="u-td bg-td">培训日期</u-td>
-                    <u-td class="u-td val-td">{{learnDate}}</u-td>
-                  </u-tr>
-                </u-table>
+                <view style="width: 100%; border: 1px solid #444550;border-bottom: none !important;border-right: none !important;border-color: #9EA5BB;">
+                  <view style="width: 100%;display: flex;">
+                    <view class="j-td j-title">姓名</view>
+                    <view class="j-td j-value">{{name}}</view>
+                  </view>
+                  <view style="width: 100%;display: flex;">
+                    <view class="j-td j-title">身份证号</view>
+                    <view class="j-td j-value">{{idCard}}</view>
+                  </view>
+                  <view style="width: 100%;display: flex;">
+                    <view class="j-td j-title">工作单位</view>
+                    <view class="j-td j-value">{{company}}</view>
+                  </view>
+                  <view style="width: 100%;display: flex;">
+                    <view class="j-td j-title">资格类型</view>
+                    <view class="j-td j-value">{{subjectName}}</view>
+                  </view>
+                  <view style="width: 100%;display: flex;">
+                    <view class="j-td j-title" >培训机构</view>
+                    <view class="j-td j-value">{{subjectName}}</view>
+                  </view>
+                  <view style="width: 100%;display: flex;">
+                    <view class="j-td j-title">培训日期</view>
+                    <view class="j-td j-value">{{learnDate}}</view>
+                  </view>
+                </view>
               </view>
               <view class="table" style="margin-top: 30rpx;">
                 <u-table class="table" border-color="#9EA5BB">
@@ -151,6 +151,25 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.j-value{
+  width: 75%;
+  color: #5A6073 !important;
+}
+.j-title{
+  width: 25%;
+  color: #191C27 !important;
+}
+.j-td{
+  border: 1px solid #444550;
+  border-top: none !important;
+  border-left: none !important;
+  border-color: #9EA5BB !important;
+  padding: 18rpx 0;
+  font-size: 22rpx !important;
+  font-weight: bold;
+  color: #191C27;
+  border-bottom-color: #9ea5bb !important;
+}
 ::-webkit-scrollbar {
   width: 0;
   height: 0;
@@ -213,20 +232,9 @@ export default {
         text-align: left;
         padding: 30rpx 0;
       }
-      .table {
-        /* background-color: #2953ff; */
-        /* min-height: 200rpx; */
-      }
       ::v-deep .u-td{
         height: 70rpx;
       }
-      /* ::v-deep .u-td:nth-of-type(even){
-        flex: 2;
-      } */
-      .bg-td{
-        background-color: #E8EBF3;
-        font-weight: bold;
-      }
     }
     .cert-foot {
       height: 100rpx;
@@ -246,6 +254,13 @@ export default {
       font-weight: bold;
       color: #5A6073 !important;
     }
+    .u-tr ::v-deep .bg-td {
+      background-color: #E8EBF3;
+      font-weight: bold;
+      .u-td{
+        color: #191C27 !important;
+      }
+    }
   }
   .foot {
       height: 100rpx;