Merge remote-tracking branch 'origin/金牛明医' into 金牛明医

src/api/his/storePayment.js

@@ -25,11 +25,11 @@ export function getStorePayment(paymentId) {
     method: 'get'
   })
 }
-export function getStatus(paymentId,refundDate) {
+export function getStatus(paymentId,refundDate,orgHfSeqId) {
   return request({
     url: '/his/storePayment/getStatus/' + paymentId,
     method: 'get',
-    params: { refundDate: refundDate }
+    params: { refundDate: refundDate,orgHfSeqId: orgHfSeqId },
   })
 }
 export function refund(paymentId) {

src/views/components/his/storePayDetails.vue

@@ -89,6 +89,12 @@
           style="width: 100%">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="退款全局流水号退款请求流水号" prop="orgHfSeqId">
+        <el-input
+          v-model="syncForm.orgHfSeqId"
+          style="width: 100%">
+        </el-input>
+      </el-form-item>
     </el-form>
 
     <div slot="footer" class="dialog-footer">
@@ -114,6 +120,7 @@ import { refund,listStorePayment,getStatus, getStorePayment, delStorePayment, ad
         syncLoading: false,
         syncForm: {
           refundDate: '',
+          orgHfSeqId: '',
         },
         syncRules: {
           refundDate: [
@@ -168,7 +175,7 @@ import { refund,listStorePayment,getStatus, getStorePayment, delStorePayment, ad
             this.$refs.syncForm.validate(valid => {
               if (valid) {
                 this.syncLoading = true;
-                getStatus(this.item.paymentId, this.syncForm.refundDate)
+                getStatus(this.item.paymentId, this.syncForm.refundDate,this.syncForm.orgHfSeqId)
                   .then(() => {
                     this.$message.success('同步成功');
                     this.syncDialogVisible = false;

src/views/system/config/integralConfig.vue

@@ -129,6 +129,16 @@
             </el-tooltip>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item  label="观看文章（图文）一篇">
+            <el-tooltip class="item" effect="dark" content="观看文章（图文）一篇，返多少积分" placement="top-end">
+              <el-input-number  v-model="form11.integralArticle"   ></el-input-number>
+            </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="观看文章（图文） 多少秒 算已看完" placement="top-end">
+              <el-input-number  v-model="form11.integralArticleTime"   ></el-input-number>
+            </el-tooltip>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -227,6 +237,7 @@ export default {
         integralFinishVideo: null,
         integralByOneDay: null,
         integralFirstOrderPoint: null,
+        integralArticle: null,
         integralTypeByOneDay: null,
         integralSubscriptCourse: null,
         integralUserRatio: 0,